diff --git a/Client/game_sa/C3DMarkerSA.cpp b/Client/game_sa/C3DMarkerSA.cpp
index 1a9f819027c..10d5c2e7d37 100644
--- a/Client/game_sa/C3DMarkerSA.cpp
+++ b/Client/game_sa/C3DMarkerSA.cpp
@@ -32,43 +32,36 @@ void C3DMarkerSA::SetMatrix(CMatrix* pMatrix)
 
 void C3DMarkerSA::SetPosition(CVector* vecPosition)
 {
-    DEBUG_TRACE("VOID C3DMarkerSA::SetPosition(CVector * vecPosition)");
     this->GetInterface()->m_mat.vPos = *vecPosition;
 }
 
 CVector* C3DMarkerSA::GetPosition()
 {
-    DEBUG_TRACE("CVector * C3DMarkerSA::GetPosition()");
     return &this->GetInterface()->m_mat.vPos;
 }
 
 DWORD C3DMarkerSA::GetType()
 {
-    DEBUG_TRACE("DWORD C3DMarkerSA::GetType()");
     return this->GetInterface()->m_nType;
 }
 
 void C3DMarkerSA::SetType(DWORD dwType)
 {
-    DEBUG_TRACE("VOID C3DMarkerSA::SetType(DWORD dwType)");
     this->GetInterface()->m_nType = (unsigned short)(dwType);
 }
 
-BOOL C3DMarkerSA::IsActive()
+bool C3DMarkerSA::IsActive()
 {
-    DEBUG_TRACE("BOOL C3DMarkerSA::IsActive()");
-    return (BOOL)this->GetInterface()->m_bIsUsed;
+    return this->GetInterface()->m_bIsUsed;
 }
 
 DWORD C3DMarkerSA::GetIdentifier()
 {
-    DEBUG_TRACE("DWORD C3DMarkerSA::GetIdentifier()");
     return this->GetInterface()->m_nIdentifier;
 }
 
 SharedUtil::SColor C3DMarkerSA::GetColor()
 {
-    DEBUG_TRACE("RGBA C3DMarkerSA::GetColor()");
     // From ABGR
     unsigned long ulABGR = this->GetInterface()->rwColour;
     SharedUtil::SColor        color;
@@ -87,61 +80,51 @@ void C3DMarkerSA::SetColor(const SharedUtil::SColor color)
 
 void C3DMarkerSA::SetPulsePeriod(WORD wPulsePeriod)
 {
-    DEBUG_TRACE("VOID C3DMarkerSA::SetPulsePeriod(WORD wPulsePeriod)");
     this->GetInterface()->m_nPulsePeriod = wPulsePeriod;
 }
 
 void C3DMarkerSA::SetRotateRate(short RotateRate)
 {
-    DEBUG_TRACE("VOID C3DMarkerSA::SetRotateRate(short RotateRate)");
     this->GetInterface()->m_nRotateRate = RotateRate;
 }
 
 float C3DMarkerSA::GetSize()
 {
-    DEBUG_TRACE("FLOAT C3DMarkerSA::GetSize()");
     return this->GetInterface()->m_fSize;
 }
 
 void C3DMarkerSA::SetSize(float fSize)
 {
-    DEBUG_TRACE("VOID C3DMarkerSA::SetSize(FLOAT fSize)");
     this->GetInterface()->m_fSize = fSize;
 }
 
 float C3DMarkerSA::GetBrightness()
 {
-    DEBUG_TRACE("FLOAT C3DMarkerSA::GetBrightness()");
     return this->GetInterface()->m_fBrightness;
 }
 
 void C3DMarkerSA::SetBrightness(float fBrightness)
 {
-    DEBUG_TRACE("VOID C3DMarkerSA::SetBrightness(FLOAT fBrightness)");
     this->GetInterface()->m_fBrightness = fBrightness;
 }
 
 void C3DMarkerSA::SetCameraRange(float fCameraRange)
 {
-    DEBUG_TRACE("VOID C3DMarkerSA::SetCameraRange(FLOAT fCameraRange)");
     this->GetInterface()->m_fCameraRange = fCameraRange;
 }
 
 void C3DMarkerSA::SetPulseFraction(float fPulseFraction)
 {
-    DEBUG_TRACE("VOID C3DMarkerSA::SetPulseFraction(FLOAT fPulseFraction)");
     this->GetInterface()->m_fPulseFraction = fPulseFraction;
 }
 
 float C3DMarkerSA::GetPulseFraction()
 {
-    DEBUG_TRACE("FLOAT C3DMarkerSA::GetPulseFraction()");
     return this->GetInterface()->m_fPulseFraction;
 }
 
 void C3DMarkerSA::Disable()
 {
-    DEBUG_TRACE("VOID C3DMarkerSA::Disable ()");
     this->GetInterface()->m_nIdentifier = 0;
 }
 
@@ -156,12 +139,6 @@ void C3DMarkerSA::DeleteMarkerObject()
             mov     ecx, dwThis
             call    dwFunc
         }
-
-        // OutputDebugString ( "Object destroyed!" );
-    }
-    else
-    {
-        // OutputDebugString ( "No object to destroy!" );
     }
 }
 
diff --git a/Client/game_sa/C3DMarkerSA.h b/Client/game_sa/C3DMarkerSA.h
index 8e669176052..b4fd3f9e1e5 100644
--- a/Client/game_sa/C3DMarkerSA.h
+++ b/Client/game_sa/C3DMarkerSA.h
@@ -13,7 +13,6 @@
 
 #include <game/C3DMarker.h>
 #include <CMatrix_Pad.h>
-#include "Common.h"
 
 #define FUNC_DeleteMarkerObject 0x722390
 
@@ -55,7 +54,6 @@ class C3DMarkerSA : public C3DMarker
     C3DMarkerSAInterface* internalInterface;
 
 public:
-    // constructor
     C3DMarkerSA(C3DMarkerSAInterface* markerInterface) { internalInterface = markerInterface; };
 
     C3DMarkerSAInterface* GetInterface() { return internalInterface; }
@@ -66,7 +64,7 @@ class C3DMarkerSA : public C3DMarker
     CVector* GetPosition();
     DWORD    GetType();                        // need enum?
     void     SetType(DWORD dwType);            // doesn't work propperly (not virtualed)
-    BOOL     IsActive();
+    bool     IsActive();
     DWORD    GetIdentifier();
     SharedUtil::SColor   GetColor();
     void     SetColor(const SharedUtil::SColor color);            // actually BGRA
diff --git a/Client/game_sa/C3DMarkersSA.cpp b/Client/game_sa/C3DMarkersSA.cpp
index 11b1a52b6c3..0b587baf216 100644
--- a/Client/game_sa/C3DMarkersSA.cpp
+++ b/Client/game_sa/C3DMarkersSA.cpp
@@ -14,7 +14,6 @@
 
 C3DMarkersSA::C3DMarkersSA()
 {
-    DEBUG_TRACE("C3DMarkersSA::C3DMarkersSA()");
     for (int i = 0; i < MAX_3D_MARKERS; i++)
     {
         this->Markers[i] = new C3DMarkerSA((C3DMarkerSAInterface*)(ARRAY_3D_MARKERS + i * sizeof(C3DMarkerSAInterface)));
@@ -32,7 +31,6 @@ C3DMarkersSA::~C3DMarkersSA()
 C3DMarker* C3DMarkersSA::CreateMarker(DWORD Identifier, e3DMarkerType dwType, CVector* vecPosition, float fSize, float fPulseFraction, BYTE r, BYTE g, BYTE b,
                                       BYTE a)
 {
-    DEBUG_TRACE("C3DMarkersSA::CreateMarker(DWORD Identifier, e3DMarkerType dwType, CVector * vecPosition, FLOAT fSize, FLOAT fPulseFraction)");
     /*
     static C3dMarker *PlaceMarker(unsigned int nIdentifier, unsigned short nType,
     CVector &vecPosition, float fSize, unsigned char r, unsigned char g, unsigned char b, unsigned char a,
@@ -84,7 +82,6 @@ C3DMarker* C3DMarkersSA::CreateMarker(DWORD Identifier, e3DMarkerType dwType, CV
 
 C3DMarker* C3DMarkersSA::FindFreeMarker()
 {
-    DEBUG_TRACE("C3DMarker * C3DMarkersSA::FindFreeMarker()");
     for (int i = 0; i < MAX_3D_MARKERS; i++)
     {
         if (!Markers[i]->IsActive())
@@ -95,7 +92,6 @@ C3DMarker* C3DMarkersSA::FindFreeMarker()
 
 C3DMarker* C3DMarkersSA::FindMarker(DWORD Identifier)
 {
-    DEBUG_TRACE("C3DMarker * C3DMarkersSA::FindMarker( DWORD Identifier )");
     for (int i = 0; i < MAX_3D_MARKERS; i++)
     {
         if (Markers[i]->GetIdentifier() == Identifier)
diff --git a/Client/game_sa/C3DMarkersSA.h b/Client/game_sa/C3DMarkersSA.h
index bd8529bb02d..9a0ead2f329 100644
--- a/Client/game_sa/C3DMarkersSA.h
+++ b/Client/game_sa/C3DMarkersSA.h
@@ -25,7 +25,6 @@ class C3DMarkersSA : public C3DMarkers
     C3DMarkerSA* Markers[MAX_3D_MARKERS];
 
 public:
-    // constructor
     C3DMarkersSA();
     ~C3DMarkersSA();
 
diff --git a/Client/game_sa/CAERadioTrackManagerSA.cpp b/Client/game_sa/CAERadioTrackManagerSA.cpp
index 4cd12a43af9..87e865d958f 100644
--- a/Client/game_sa/CAERadioTrackManagerSA.cpp
+++ b/Client/game_sa/CAERadioTrackManagerSA.cpp
@@ -14,7 +14,6 @@
 
 BYTE CAERadioTrackManagerSA::GetCurrentRadioStationID()
 {
-    DEBUG_TRACE("BYTE CAERadioTrackManagerSA::GetCurrentRadioStationID()");
     DWORD dwFunc = FUNC_GetCurrentRadioStationID;
     BYTE  bReturn = 0;
     _asm
@@ -29,7 +28,6 @@ BYTE CAERadioTrackManagerSA::GetCurrentRadioStationID()
 
 BYTE CAERadioTrackManagerSA::IsVehicleRadioActive()
 {
-    DEBUG_TRACE("BYTE CAERadioTrackManagerSA::IsVehicleRadioActive()");
     DWORD dwFunc = FUNC_IsVehicleRadioActive;
     BYTE  bReturn = 0;
     _asm
@@ -44,7 +42,6 @@ BYTE CAERadioTrackManagerSA::IsVehicleRadioActive()
 
 char* CAERadioTrackManagerSA::GetRadioStationName(BYTE bStationID)
 {
-    DEBUG_TRACE("char * CAERadioTrackManagerSA::GetRadioStationName(BYTE bStationID)");
     DWORD dwFunc = FUNC_GetRadioStationName;
     char* cReturn = 0;
     DWORD dwStationID = bStationID;
@@ -59,11 +56,10 @@ char* CAERadioTrackManagerSA::GetRadioStationName(BYTE bStationID)
     return cReturn;
 }
 
-BOOL CAERadioTrackManagerSA::IsRadioOn()
+bool CAERadioTrackManagerSA::IsRadioOn()
 {
-    DEBUG_TRACE("BOOL CAERadioTrackManagerSA::IsRadioOn()");
     DWORD dwFunc = FUNC_IsRadioOn;
-    BYTE  bReturn = 0;
+    bool  bReturn = false;
     _asm
     {
         mov     ecx, CLASS_CAERadioTrackManager
@@ -76,7 +72,6 @@ BOOL CAERadioTrackManagerSA::IsRadioOn()
 
 void CAERadioTrackManagerSA::SetBassSetting(DWORD dwBass)
 {
-    DEBUG_TRACE("VOID CAERadioTrackManagerSA::SetBassSetting(DWORD dwBass)");
     DWORD dwFunc = FUNC_SetBassSetting;
     _asm
     {
@@ -89,7 +84,6 @@ void CAERadioTrackManagerSA::SetBassSetting(DWORD dwBass)
 
 void CAERadioTrackManagerSA::Reset()
 {
-    DEBUG_TRACE("VOID CAERadioTrackManagerSA::Reset()");
     DWORD dwFunc = FUNC_Reset;
     _asm
     {
@@ -100,7 +94,6 @@ void CAERadioTrackManagerSA::Reset()
 
 void CAERadioTrackManagerSA::StartRadio(BYTE bStationID, BYTE bUnknown)
 {
-    DEBUG_TRACE("VOID CAERadioTrackManagerSA::StartRadio(BYTE bStationID, BYTE bUnknown)");
     DWORD dwFunc = FUNC_StartRadio;
     DWORD dwStationID = bStationID;
     DWORD dwUnknown = bUnknown;
diff --git a/Client/game_sa/CAERadioTrackManagerSA.h b/Client/game_sa/CAERadioTrackManagerSA.h
index be3283d3832..891730a7989 100644
--- a/Client/game_sa/CAERadioTrackManagerSA.h
+++ b/Client/game_sa/CAERadioTrackManagerSA.h
@@ -29,7 +29,7 @@ class CAERadioTrackManagerSA : public CAERadioTrackManager
     BYTE  GetCurrentRadioStationID();
     BYTE  IsVehicleRadioActive();
     char* GetRadioStationName(BYTE bStationID);
-    BOOL  IsRadioOn();
+    bool  IsRadioOn();
     void  SetBassSetting(DWORD dwBass);
     void  Reset();
     void  StartRadio(BYTE bStationID, BYTE bUnknown);
diff --git a/Client/game_sa/CAudioEngineSA.cpp b/Client/game_sa/CAudioEngineSA.cpp
index a154b3a4a21..f6291bf0775 100644
--- a/Client/game_sa/CAudioEngineSA.cpp
+++ b/Client/game_sa/CAudioEngineSA.cpp
@@ -157,7 +157,6 @@ void CAudioEngineSA::PlayFrontEndSound(DWORD dwEventID)
 {
     if (*(DWORD*)VAR_AudioEventVolumes != 0 && dwEventID <= 101)            // may prevent a crash
     {
-        DEBUG_TRACE("VOID CAudioEngineSA::PlayFrontEndSound(DWORD dwSound)");
         DWORD dwFunc = FUNC_ReportFrontendAudioEvent;
         float fSpeed = 1.0f;
         float fVolumeChange = 0.0f;
@@ -224,7 +223,6 @@ void CAudioEngineSA::PlayBeatTrack(short iTrack)
 {
     if (*(DWORD*)VAR_AudioEventVolumes != 0)            // may prevent a crash
     {
-        DEBUG_TRACE("VOID CAudioEngineSA::PlayBeatTrack ( short iTrack )");
         DWORD dwFunc = FUNC_PreloadBeatTrack;
         DWORD dwTrack = iTrack;
         _asm
diff --git a/Client/game_sa/CAutomobileSA.cpp b/Client/game_sa/CAutomobileSA.cpp
index f0f57b57809..136c9cb98c7 100644
--- a/Client/game_sa/CAutomobileSA.cpp
+++ b/Client/game_sa/CAutomobileSA.cpp
@@ -17,8 +17,6 @@
  */
 CAutomobileSA::CAutomobileSA(eVehicleTypes dwModelID, unsigned char ucVariation, unsigned char ucVariation2) : CVehicleSA(dwModelID, ucVariation, ucVariation2)
 {
-    DEBUG_TRACE("CAutomobileSA::CAutomobileSA( eVehicleTypes dwModelID ):CVehicleSA( dwModelID )");
-
     // create our mirror classes
     for (int i = 0; i < MAX_DOORS; i++)
         this->door[i] = new CDoorSA(&((CAutomobileSAInterface*)this->GetInterface())->m_doors[i]);
@@ -27,7 +25,6 @@ CAutomobileSA::CAutomobileSA(eVehicleTypes dwModelID, unsigned char ucVariation,
 
 CAutomobileSA::CAutomobileSA(CAutomobileSAInterface* automobile)
 {
-    DEBUG_TRACE("CAutomobileSA::CAutomobileSA( CAutomobileSAInterface * automobile )");
     // just so it can be passed on to CVehicle
 }
 
@@ -42,7 +39,6 @@ CAutomobileSA::~CAutomobileSA()
 
 bool CAutomobileSA::BurstTyre(DWORD dwTyreID)
 {
-    DEBUG_TRACE("bool CAutomobileSA::BurstTyre ( DWORD dwTyreID )");
     DWORD dwThis = (DWORD)GetInterface();
     DWORD dwFunc = FUNC_CAutomobile_BurstTyre;
     bool  bReturn;
@@ -60,7 +56,6 @@ bool CAutomobileSA::BurstTyre(DWORD dwTyreID)
 
 bool CAutomobileSA::BreakTowLink()
 {
-    DEBUG_TRACE("bool CAutomobileSA::BreakTowLink ( void )");
     DWORD dwThis = (DWORD)GetInterface();
     DWORD dwFunc = FUNC_CAutomobile_BreakTowLink;
     bool  bReturn;
@@ -77,7 +72,6 @@ bool CAutomobileSA::BreakTowLink()
 
 bool CAutomobileSA::IsComponentPresent(int iComponentID)
 {
-    DEBUG_TRACE("bool CAutomobileSA::IsComponentPresent ( int iComponentID )");
     DWORD dwThis = (DWORD)GetInterface();
     DWORD dwFunc = FUNC_CAutomobile_IsComponentPresent;
     bool  bReturn;
@@ -95,7 +89,6 @@ bool CAutomobileSA::IsComponentPresent(int iComponentID)
 
 void CAutomobileSA::ResetSuspension()
 {
-    DEBUG_TRACE("void CAutomobileSA::ResetSuspension ( void )");
     DWORD dwThis = (DWORD)GetInterface();
     DWORD dwFunc = FUNC_CAutomobile_ResetSuspension;
 
@@ -108,7 +101,6 @@ void CAutomobileSA::ResetSuspension()
 
 void CAutomobileSA::SetTaxiLight(bool bState)
 {
-    DEBUG_TRACE("void CAutomobileSA::SetTaxiLight ( bool bState )");
     DWORD dwThis = (DWORD)GetInterface();
     DWORD dwState = (DWORD)bState;
     DWORD dwFunc = FUNC_CAutomobile_SetTaxiLight;
@@ -123,7 +115,6 @@ void CAutomobileSA::SetTaxiLight(bool bState)
 
 CPhysical* CAutomobileSA::SpawnFlyingComponent(int iCarNodeIndex, int iUnknown)
 {
-    DEBUG_TRACE("CPhysical* CAutomobileSA::SpawnFlyingComponent ( int iCarNodeIndex, int iUnknown )");
     DWORD      dwThis = (DWORD)GetInterface();
     DWORD      dwFunc = FUNC_CAutomobile_SpawnFlyingComponent;
     CPhysical* pReturn;
@@ -142,6 +133,5 @@ CPhysical* CAutomobileSA::SpawnFlyingComponent(int iCarNodeIndex, int iUnknown)
 
 CDoor* CAutomobileSA::GetDoor(eDoors doorID)
 {
-    DEBUG_TRACE("CDoor * CAutomobileSA::GetDoor(eDoors doorID)");
     return this->door[doorID];
 }
diff --git a/Client/game_sa/CBikeSA.cpp b/Client/game_sa/CBikeSA.cpp
index 4fcf3fbb550..5913d34cbee 100644
--- a/Client/game_sa/CBikeSA.cpp
+++ b/Client/game_sa/CBikeSA.cpp
@@ -14,13 +14,11 @@
 
 CBikeSA::CBikeSA(CBikeSAInterface* bike)
 {
-    DEBUG_TRACE("CBikeSA::CBikeSA( CBikeSAInterface * bike )");
     this->m_pInterface = bike;
 }
 
 CBikeSA::CBikeSA(eVehicleTypes dwModelID, unsigned char ucVariation, unsigned char ucVariation2) : CVehicleSA(dwModelID, ucVariation, ucVariation2)
 {
-    DEBUG_TRACE("CBikeSA::CBikeSA( eVehicleTypes dwModelID ):CVehicleSA( dwModelID )");
     /*if(this->internalInterface)
     {
         // create the actual vehicle
diff --git a/Client/game_sa/CBmxSA.cpp b/Client/game_sa/CBmxSA.cpp
index 52d8418e7b6..487755abbea 100644
--- a/Client/game_sa/CBmxSA.cpp
+++ b/Client/game_sa/CBmxSA.cpp
@@ -14,11 +14,9 @@
 
 CBmxSA::CBmxSA(CBmxSAInterface* bmx)
 {
-    DEBUG_TRACE("CBmxSA::CBmxSA( CBmxSAInterface * bmx )");
     this->m_pInterface = bmx;
 }
 
 CBmxSA::CBmxSA(eVehicleTypes dwModelID, unsigned char ucVariation, unsigned char ucVariation2) : CBikeSA(dwModelID, ucVariation, ucVariation2)
 {
-    DEBUG_TRACE("CBmxSA::CBmxSA( eVehicleTypes dwModelID ):CBikeSA( dwModelID )");
 }
diff --git a/Client/game_sa/CBoatSA.cpp b/Client/game_sa/CBoatSA.cpp
index 0db2537ae7f..345fd67c1f1 100644
--- a/Client/game_sa/CBoatSA.cpp
+++ b/Client/game_sa/CBoatSA.cpp
@@ -14,13 +14,11 @@
 
 CBoatSA::CBoatSA(CBoatSAInterface* boat)
 {
-    DEBUG_TRACE("CBoatSA::CBoatSA( CBoatSAInterface * boat )");
     this->m_pInterface = boat;
 }
 
 CBoatSA::CBoatSA(eVehicleTypes dwModelID, unsigned char ucVariation, unsigned char ucVariation2) : CVehicleSA(dwModelID, ucVariation, ucVariation2)
 {
-    DEBUG_TRACE("CBoatSA::CBoatSA( eVehicleTypes dwModelID ):CVehicleSA( dwModelID )");
     /*if(this->internalInterface)
     {
         // create the actual vehicle
diff --git a/Client/game_sa/CBuildingSA.cpp b/Client/game_sa/CBuildingSA.cpp
index 5643c564367..571d00037f1 100644
--- a/Client/game_sa/CBuildingSA.cpp
+++ b/Client/game_sa/CBuildingSA.cpp
@@ -15,13 +15,11 @@
 
 CBuildingSA::CBuildingSA(CBuildingSAInterface* objectInterface)
 {
-    DEBUG_TRACE("CBuildingSA::CBuildingSA(CBuildingSAInterface * objectInterface)");
     this->SetInterface(objectInterface);
 }
 
 CBuildingSA::CBuildingSA(DWORD dwModel)
 {
-    DEBUG_TRACE("CBuildingSA::CBuildingSA( DWORD dwModel )");
     /*
     DWORD CBuilding_operator_new = FUNC_CBuilding_operator_new;
     DWORD CBuilding_constructor = FUNC_CBuilding_Constructor;
@@ -157,7 +155,6 @@ CBuildingSA::CBuildingSA(DWORD dwModel)
 
 CBuildingSA::~CBuildingSA()
 {
-    DEBUG_TRACE("CBuildingSA::~CBuildingSA( )");
     if (!this->BeingDeleted && DoNotRemoveFromGame == false)
     {
         DWORD dwInterface = (DWORD)this->GetInterface();
diff --git a/Client/game_sa/CCameraSA.cpp b/Client/game_sa/CCameraSA.cpp
index 552ffe2c946..1c1e590a213 100644
--- a/Client/game_sa/CCameraSA.cpp
+++ b/Client/game_sa/CCameraSA.cpp
@@ -26,7 +26,6 @@ void  HOOK_Camera_CollisionDetection();
 
 CCameraSA::CCameraSA(CCameraSAInterface* cameraInterface)
 {
-    DEBUG_TRACE("CCameraSA::CCameraSA(CCameraSAInterface * cameraInterface)");
     this->internalInterface = cameraInterface;
     for (int i = 0; i < MAX_CAMS; i++)
         this->Cams[i] = new CCamSA(&this->internalInterface->Cams[i]);
@@ -45,7 +44,6 @@ CCameraSA::~CCameraSA()
 
 void CCameraSA::Restore()
 {
-    DEBUG_TRACE("VOID CCameraSA::Restore()");
     DWORD               dwFunc = FUNC_Restore;
     CCameraSAInterface* cameraInterface = this->GetInterface();
     _asm
@@ -57,7 +55,6 @@ void CCameraSA::Restore()
 
 void CCameraSA::RestoreWithJumpCut()
 {
-    DEBUG_TRACE("VOID CCameraSA::RestoreWithJumpCut()");
     CCameraSAInterface* cameraInterface = this->GetInterface();
     DWORD               dwFunc = 0x50BD40;
     _asm
@@ -78,8 +75,6 @@ void CCameraSA::RestoreWithJumpCut()
  */
 void CCameraSA::TakeControl(CEntity* entity, eCamMode CamMode, int CamSwitchStyle)
 {
-    DEBUG_TRACE("VOID CCameraSA::TakeControl(CEntity * entity, eCamMode CamMode, int CamSwitchStyle)");
-
     CEntitySA* pEntitySA = dynamic_cast<CEntitySA*>(entity);
     if (!pEntitySA)
         return;
@@ -102,7 +97,6 @@ void CCameraSA::TakeControl(CEntity* entity, eCamMode CamMode, int CamSwitchStyl
 
 void CCameraSA::TakeControl(CVector* position, int CamSwitchStyle)
 {
-    DEBUG_TRACE("VOID CCameraSA::TakeControl(CVector * position, int CamSwitchStyle)");
     CCameraSAInterface* cameraInterface = this->GetInterface();
     // __thiscall
     CVector vecOffset;
@@ -191,8 +185,6 @@ void CCameraSA::RestoreLastGoodState()
 
 CMatrix* CCameraSA::GetMatrix(CMatrix* matrix)
 {
-    DEBUG_TRACE("CMatrix * CCameraSA::GetMatrix ( CMatrix * matrix )");
-    // CCameraSAInterface * pCamInterface = this->GetInterface();
     CMatrix_Padded* pCamMatrix = &this->GetInterface()->m_cameraMatrix;            // ->Placeable.matrix;
     if (pCamMatrix)
     {
@@ -216,7 +208,6 @@ CMatrix* CCameraSA::GetMatrix(CMatrix* matrix)
 
 void CCameraSA::SetMatrix(CMatrix* matrix)
 {
-    DEBUG_TRACE("VOID CCameraSA::SetMatrix ( CMatrix * matrix )");
     CMatrix_Padded* pCamMatrix = this->GetInterface()->Placeable.matrix;
     if (pCamMatrix)
     {
@@ -229,7 +220,6 @@ void CCameraSA::SetMatrix(CMatrix* matrix)
 
 void CCameraSA::Find3rdPersonCamTargetVector(float fDistance, CVector* vecGunMuzzle, CVector* vecSource, CVector* vecTarget)
 {
-    DEBUG_TRACE("VOID CCameraSA::Find3rdPersonCamTargetVector ( FLOAT fDistance, CVector * vecGunMuzzle, CVector * vecSource, CVector * vecTarget )");
     float               fOriginX = vecGunMuzzle->fX;
     float               fOriginY = vecGunMuzzle->fY;
     float               fOriginZ = vecGunMuzzle->fZ;
@@ -250,7 +240,6 @@ void CCameraSA::Find3rdPersonCamTargetVector(float fDistance, CVector* vecGunMuz
 
 float CCameraSA::Find3rdPersonQuickAimPitch()
 {
-    DEBUG_TRACE("float CCameraSA::Find3rdPersonQuickAimPitch ( void )");
     float               fReturn;
     DWORD               dwFunc = FUNC_Find3rdPersonQuickAimPitch;
     CCameraSAInterface* cameraInterface = this->GetInterface();
@@ -265,15 +254,12 @@ float CCameraSA::Find3rdPersonQuickAimPitch()
 
 BYTE CCameraSA::GetActiveCam()
 {
-    DEBUG_TRACE("BYTE CCameraSA::GetActiveCam()");
     CCameraSAInterface* cameraInterface = this->GetInterface();
     return cameraInterface->ActiveCam;
 }
 
 CCam* CCameraSA::GetCam(BYTE bCameraID)
 {
-    DEBUG_TRACE("CCam * CCameraSA::GetCam(BYTE bCameraID)");
-
     if (bCameraID < MAX_CAMS)
         return Cams[bCameraID];
 
@@ -293,19 +279,13 @@ CCam* CCameraSA::GetCam(CCamSAInterface* camInterface)
     return NULL;
 }
 
-void CCameraSA::SetWidescreen(BOOL bWidescreen)
+void CCameraSA::SetWidescreen(bool bWidescreen)
 {
-    DEBUG_TRACE("VOID CCameraSA::SetWidescreen(BOOL bWidescreen)");
-    CCameraSAInterface* cameraInterface = this->GetInterface();
-    if (bWidescreen == FALSE)
-        cameraInterface->m_WideScreenOn = false;
-    else
-        cameraInterface->m_WideScreenOn = true;
+    GetInterface()->m_WideScreenOn = bWidescreen;
 }
 
-BOOL CCameraSA::GetWidescreen()
+bool CCameraSA::GetWidescreen()
 {
-    DEBUG_TRACE("BOOL CCameraSA::GetWidescreen()");
     CCameraSAInterface* cameraInterface = this->GetInterface();
     return cameraInterface->m_WideScreenOn;
 }
diff --git a/Client/game_sa/CCameraSA.h b/Client/game_sa/CCameraSA.h
index ef98a6812ae..ed83ac18d93 100644
--- a/Client/game_sa/CCameraSA.h
+++ b/Client/game_sa/CCameraSA.h
@@ -408,8 +408,8 @@ class CCameraSA : public CCamera
     CCam*         GetCam(BYTE bCameraID);
     virtual CCam* GetCam(CCamSAInterface* camInterface);
 
-    void      SetWidescreen(BOOL bWidescreen);
-    BOOL      GetWidescreen();
+    void      SetWidescreen(bool bWidescreen);
+    bool      GetWidescreen();
     bool      IsFading();
     int       GetFadingDirection();
     void      Fade(float fFadeOutTime, int iOutOrIn);
diff --git a/Client/game_sa/CCheckpointSA.cpp b/Client/game_sa/CCheckpointSA.cpp
index 52ca1118333..8352ffd3bf4 100644
--- a/Client/game_sa/CCheckpointSA.cpp
+++ b/Client/game_sa/CCheckpointSA.cpp
@@ -16,67 +16,56 @@
 
 void CCheckpointSA::SetPosition(CVector* vecPosition)
 {
-    DEBUG_TRACE("VOID CCheckpointSA::SetPosition(CVector * vecPosition)");
     MemCpyFast(&this->GetInterface()->m_pos, vecPosition, sizeof(CVector));
 }
 
 CVector* CCheckpointSA::GetPosition()
 {
-    DEBUG_TRACE("CVector * CCheckpointSA::GetPosition()");
     return &this->GetInterface()->m_pos;
 }
 
 void CCheckpointSA::SetPointDirection(CVector* vecPointDirection)
 {
-    DEBUG_TRACE("VOID CCheckpointSA::SetPointDirection(CVector * vecPointDirection)");
     MemCpyFast(&this->GetInterface()->m_pointDir, vecPointDirection, sizeof(CVector));
 }
 
 CVector* CCheckpointSA::GetPointDirection()
 {
-    DEBUG_TRACE("CVector * CCheckpointSA::GetPointDirection()");
     return &this->GetInterface()->m_pointDir;
 }
 
 DWORD CCheckpointSA::GetType()
 {
-    DEBUG_TRACE("DWORD CCheckpointSA::GetType()");
     return this->GetInterface()->m_nType;
 }
 
 void CCheckpointSA::SetType(WORD wType)
 {
-    DEBUG_TRACE("VOID CCheckpointSA::SetType(DWORD dwType)");
     this->GetInterface()->m_nType = wType;
 }
 
-BOOL CCheckpointSA::IsActive()
+bool CCheckpointSA::IsActive()
 {
-    DEBUG_TRACE("BOOL CCheckpointSA::IsActive()");
-    return (BOOL)this->GetInterface()->m_bIsUsed;
+    return this->GetInterface()->m_bIsUsed;
 }
 
 void CCheckpointSA::Activate()
 {
-    DEBUG_TRACE("VOID CCheckpointSA::Activate()");
     this->GetInterface()->m_bIsUsed = true;
 }
 
 DWORD CCheckpointSA::GetIdentifier()
 {
-    DEBUG_TRACE("DWORD CCheckpointSA::GetIdentifier()");
     return this->GetInterface()->m_nIdentifier;
 }
 
 void CCheckpointSA::SetIdentifier(DWORD dwIdentifier)
 {
-    DEBUG_TRACE("VOID CCheckpointSA::SetIdentifier(DWORD dwIdentifier)");
     this->GetInterface()->m_nIdentifier = dwIdentifier;
 }
 
 SharedUtil::SColor CCheckpointSA::GetColor()
 {
-    DEBUG_TRACE("RGBA CCheckpointSA::GetColor()");
     // From ABGR
     unsigned long ulABGR = this->GetInterface()->rwColour;
     SharedUtil::SColor        color;
@@ -89,20 +78,17 @@ SharedUtil::SColor CCheckpointSA::GetColor()
 
 void CCheckpointSA::SetColor(const SharedUtil::SColor color)
 {
-    DEBUG_TRACE("VOID CCheckpointSA::SetColor(RGBA color)");
     // To ABGR
     this->GetInterface()->rwColour = (color.A << 24) | (color.B << 16) | (color.G << 8) | color.R;
 }
 
 void CCheckpointSA::SetPulsePeriod(WORD wPulsePeriod)
 {
-    DEBUG_TRACE("VOID CCheckpointSA::SetPulsePeriod(WORD wPulsePeriod)");
     this->GetInterface()->m_nPulsePeriod = wPulsePeriod;
 }
 
 void CCheckpointSA::SetRotateRate(short RotateRate)
 {
-    DEBUG_TRACE("VOID CCheckpointSA::SetRotateRate(short RotateRate)");
     this->GetInterface()->m_nRotateRate = RotateRate;
 
     if (RotateRate == 0)
@@ -117,37 +103,31 @@ void CCheckpointSA::SetRotateRate(short RotateRate)
 
 float CCheckpointSA::GetSize()
 {
-    DEBUG_TRACE("FLOAT CCheckpointSA::GetSize()");
     return this->GetInterface()->m_fSize;
 }
 
 void CCheckpointSA::SetSize(float fSize)
 {
-    DEBUG_TRACE("VOID CCheckpointSA::SetSize(FLOAT fSize)");
     this->GetInterface()->m_fSize = fSize;
 }
 
 void CCheckpointSA::SetCameraRange(float fCameraRange)
 {
-    DEBUG_TRACE("VOID CCheckpointSA::SetCameraRange(FLOAT fCameraRange)");
     this->GetInterface()->m_fCameraRange = fCameraRange;
 }
 
 void CCheckpointSA::SetPulseFraction(float fPulseFraction)
 {
-    DEBUG_TRACE("VOID CCheckpointSA::SetPulseFraction(FLOAT fPulseFraction)");
     this->GetInterface()->m_fPulseFraction = fPulseFraction;
 }
 
 float CCheckpointSA::GetPulseFraction()
 {
-    DEBUG_TRACE("FLOAT CCheckpointSA::GetPulseFraction()");
     return this->GetInterface()->m_fPulseFraction;
 }
 
 void CCheckpointSA::Remove()
 {
-    DEBUG_TRACE("VOID CCheckpointSA::Remove()");
     this->GetInterface()->m_bIsUsed = false;
     this->GetInterface()->m_nType = 257;
     this->GetInterface()->rwColour = 0;
diff --git a/Client/game_sa/CCheckpointSA.h b/Client/game_sa/CCheckpointSA.h
index 2429e9ae518..2161941b305 100644
--- a/Client/game_sa/CCheckpointSA.h
+++ b/Client/game_sa/CCheckpointSA.h
@@ -47,7 +47,7 @@ class CCheckpointSA : public CCheckpoint
     CVector* GetPointDirection();
     DWORD    GetType();                      // need enum?
     void     SetType(WORD wType);            // doesn't work propperly (not virtualed)
-    BOOL     IsActive();
+    bool     IsActive();
     void     Activate();
     DWORD    GetIdentifier();
     void     SetIdentifier(DWORD dwIdentifier);
diff --git a/Client/game_sa/CCheckpointsSA.cpp b/Client/game_sa/CCheckpointsSA.cpp
index 521ce832962..923baeb06a2 100644
--- a/Client/game_sa/CCheckpointsSA.cpp
+++ b/Client/game_sa/CCheckpointsSA.cpp
@@ -13,10 +13,8 @@
 #include "CCheckpointsSA.h"
 #include "CCheckpointSA.h"
 
-// constructor
 CCheckpointsSA::CCheckpointsSA()
 {
-    DEBUG_TRACE("CCheckpointsSA::CCheckpointsSA()");
     for (int i = 0; i < MAX_CHECKPOINTS; i++)
         this->Checkpoints[i] = new CCheckpointSA((CCheckpointSAInterface*)(ARRAY_CHECKPOINTS + i * sizeof(CCheckpointSAInterface)));
 }
@@ -35,9 +33,6 @@ CCheckpointsSA::~CCheckpointsSA()
 CCheckpoint* CCheckpointsSA::CreateCheckpoint(DWORD Identifier, WORD wType, CVector* vecPosition, CVector* vecPointDir, float fSize, float fPulseFraction,
                                               const SharedUtil::SColor color)
 {
-    DEBUG_TRACE(
-        "CCheckpoint * CCheckpointsSA::CreateCheckpoint(DWORD Identifier, DWORD wType, CVector * vecPosition, CVector * vecPointDir, FLOAT fSize, FLOAT "
-        "fPulseFraction, RGBA Color)");
     /*
     static CCheckpoint  *PlaceMarker(unsigned int nIdentifier, unsigned short nType, CVector &vecPosition, CVector &pointDir,
     float fSize, unsigned char r, unsigned char g, unsigned char b, unsigned char a, unsigned short nPeriod, float fPulseFrac, short nRotRate);
@@ -59,43 +54,11 @@ CCheckpoint* CCheckpointsSA::CreateCheckpoint(DWORD Identifier, WORD wType, CVec
 
         return Checkpoint;
     }
-
-    /*  DWORD dwFunc = FUNC_CCheckpoints__PlaceMarker;
-        DWORD dwReturn = 0;
-        _asm
-        {
-            push    1               // rotate rate
-            push    fPulseFraction  // pulse
-            push    1024            // period
-            push    255             // alpha
-            push    0               // blue
-            push    0               // green
-            push    255             // red
-            push    fSize           // size
-            push    vecPointDir     // point direction
-            push    vecPosition     // position
-            push    dwType          // type
-            push    Identifier      // identifier
-            call    dwFunc
-            mov     dwReturn, eax
-            add     esp, 0x30
-        }
-
-        if(dwReturn)
-        {
-            for(int i = 0; i < MAX_CHECKPOINTS; i++)
-            {
-                if(Checkpoints[i]->GetInterface() == (CCheckpointSAInterface *)dwReturn)
-                    return Checkpoints[i];
-            }
-        }*/
-
     return NULL;
 }
 
 CCheckpoint* CCheckpointsSA::FindFreeMarker()
 {
-    DEBUG_TRACE("CCheckpoint * CCheckpointsSA::FindFreeMarker()");
     for (int i = 0; i < MAX_CHECKPOINTS; i++)
     {
         if (!Checkpoints[i]->IsActive())
diff --git a/Client/game_sa/CCheckpointsSA.h b/Client/game_sa/CCheckpointsSA.h
index a23ffc307e6..ca23b33e487 100644
--- a/Client/game_sa/CCheckpointsSA.h
+++ b/Client/game_sa/CCheckpointsSA.h
@@ -28,7 +28,6 @@ class CCheckpointsSA : public CCheckpoints
     CCheckpointSA* Checkpoints[MAX_CHECKPOINTS];
 
 public:
-    // constructor
     CCheckpointsSA();
     ~CCheckpointsSA();
 
diff --git a/Client/game_sa/CClockSA.cpp b/Client/game_sa/CClockSA.cpp
index d505cacf3dd..0c41bf6167c 100644
--- a/Client/game_sa/CClockSA.cpp
+++ b/Client/game_sa/CClockSA.cpp
@@ -16,7 +16,6 @@ extern CGameSA* pGame;
 
 void CClockSA::Set(BYTE bHour, BYTE bMinute)
 {
-    DEBUG_TRACE("VOID CClockSA::Set ( BYTE bHour, BYTE bMinute )");
     if (bMinute >= 0 && bMinute <= 60 && bHour >= 0 && bHour <= 23)
     {
         MemPutFast<BYTE>(VAR_TimeMinutes, bMinute);
@@ -27,7 +26,6 @@ void CClockSA::Set(BYTE bHour, BYTE bMinute)
 
 void CClockSA::Get(BYTE* bHour, BYTE* bMinute)
 {
-    DEBUG_TRACE("VOID CClockSA::Get ( BYTE * bHour, BYTE * bMinute )");
     *bMinute = *(BYTE*)VAR_TimeMinutes;
     *bHour = *(BYTE*)VAR_TimeHours;
 }
diff --git a/Client/game_sa/CCoronasSA.cpp b/Client/game_sa/CCoronasSA.cpp
index b57cbd1d228..612cf625d83 100644
--- a/Client/game_sa/CCoronasSA.cpp
+++ b/Client/game_sa/CCoronasSA.cpp
@@ -15,7 +15,6 @@
 
 CCoronasSA::CCoronasSA()
 {
-    DEBUG_TRACE("CCoronasSA::CCoronasSA()");
     for (int i = 0; i < MAX_CORONAS; i++)
     {
         Coronas[i] = new CRegisteredCoronaSA((CRegisteredCoronaSAInterface*)(ARRAY_CORONAS + i * sizeof(CRegisteredCoronaSAInterface)));
@@ -32,13 +31,11 @@ CCoronasSA::~CCoronasSA()
 
 CRegisteredCorona* CCoronasSA::GetCorona(DWORD ID)
 {
-    DEBUG_TRACE("CRegisteredCorona * CCoronasSA::GetCorona(DWORD ID)");
     return (CRegisteredCorona*)this->Coronas[ID];
 }
 
 CRegisteredCorona* CCoronasSA::CreateCorona(DWORD Identifier, CVector* position)
 {
-    DEBUG_TRACE("CRegisteredCorona * CCoronasSA::CreateCorona(DWORD Identifier, CVector * position)");
     CRegisteredCoronaSA* corona;
     corona = (CRegisteredCoronaSA*)this->FindCorona(Identifier);
 
@@ -62,7 +59,6 @@ CRegisteredCorona* CCoronasSA::CreateCorona(DWORD Identifier, CVector* position)
 
 CRegisteredCorona* CCoronasSA::FindFreeCorona()
 {
-    DEBUG_TRACE("CRegisteredCorona * CCoronasSA::FindFreeCorona()");
     for (int i = 2; i < MAX_CORONAS; i++)
     {
         if (Coronas[i]->GetIdentifier() == 0)
@@ -75,8 +71,6 @@ CRegisteredCorona* CCoronasSA::FindFreeCorona()
 
 CRegisteredCorona* CCoronasSA::FindCorona(DWORD Identifier)
 {
-    DEBUG_TRACE("CRegisteredCorona * CCoronasSA::FindCorona(DWORD Identifier)");
-
     for (int i = 0; i < MAX_CORONAS; i++)
     {
         if (Coronas[i]->GetIdentifier() == Identifier)
@@ -89,7 +83,6 @@ CRegisteredCorona* CCoronasSA::FindCorona(DWORD Identifier)
 
 RwTexture* CCoronasSA::GetTexture(eCoronaType type)
 {
-    DEBUG_TRACE("RwTexture * CCoronasSA::GetTexture(eCoronaType type)");
     if (type < MAX_CORONA_TEXTURES)
         return (RwTexture*)(*(DWORD*)(ARRAY_CORONA_TEXTURES + type * sizeof(DWORD)));
     else
diff --git a/Client/game_sa/CDamageManagerSA.cpp b/Client/game_sa/CDamageManagerSA.cpp
index 4f4897c0aa3..ac05acbedee 100644
--- a/Client/game_sa/CDamageManagerSA.cpp
+++ b/Client/game_sa/CDamageManagerSA.cpp
@@ -14,13 +14,11 @@
 
 BYTE CDamageManagerSA::GetEngineStatus()
 {
-    DEBUG_TRACE("BYTE CDamageManagerSA::GetEngineStatus (  )");
     return internalInterface->bEngineStatus;
 }
 
 void CDamageManagerSA::SetEngineStatus(BYTE bEngineState)
 {
-    DEBUG_TRACE("VOID CDamageManagerSA::SetEngineStatus ( BYTE bEngineState )");
     if (bEngineState > 250)
         bEngineState = 250;
     internalInterface->bEngineStatus = bEngineState;
@@ -28,7 +26,6 @@ void CDamageManagerSA::SetEngineStatus(BYTE bEngineState)
 
 BYTE CDamageManagerSA::GetDoorStatus(eDoors bDoor)
 {
-    DEBUG_TRACE("BYTE CDamageManagerSA::GetDoorStatus ( eDoors bDoor )");
     if (bDoor < MAX_DOORS)
         return internalInterface->Door[bDoor];
     return NULL;
@@ -36,8 +33,6 @@ BYTE CDamageManagerSA::GetDoorStatus(eDoors bDoor)
 
 void CDamageManagerSA::SetDoorStatus(eDoors bDoor, BYTE bDoorStatus, bool spawnFlyingComponent)
 {
-    DEBUG_TRACE("VOID CDamageManagerSA::SetDoorStatus ( eDoors bDoor, BYTE bDoorStatus, bool spawnFlyingComponent )");
-
     if (bDoor < MAX_DOORS)
     {
         // Different from before?
@@ -86,7 +81,6 @@ void CDamageManagerSA::SetDoorStatus(eDoors bDoor, BYTE bDoorStatus, bool spawnF
 
 BYTE CDamageManagerSA::GetWheelStatus(eWheelPosition bWheel)
 {
-    DEBUG_TRACE("BYTE CDamageManagerSA::GetWheelStatus ( eWheelPosition bWheel )");
     if (bWheel < MAX_WHEELS)
         return internalInterface->Wheel[bWheel];
     return NULL;
@@ -94,7 +88,6 @@ BYTE CDamageManagerSA::GetWheelStatus(eWheelPosition bWheel)
 
 void CDamageManagerSA::SetWheelStatus(eWheelPosition bWheel, BYTE bTireStatus)
 {
-    DEBUG_TRACE("VOID CDamageManagerSA::SetWheelStatus ( eWheelPosition bWheel, BYTE bTireStatus )");
     if (bWheel < MAX_WHEELS)
     {
         // Different than before?
@@ -107,7 +100,6 @@ void CDamageManagerSA::SetWheelStatus(eWheelPosition bWheel, BYTE bTireStatus)
 
 void CDamageManagerSA::SetPanelStatus(BYTE bPanel, BYTE bPanelStatus)
 {
-    DEBUG_TRACE("BYTE CDamageManagerSA::SetPanelStatus ( BYTE bLight, BYTE bPanelStatus )");
 
     // Valid index?
     if (bPanel < MAX_PANELS && bPanelStatus <= 3)
@@ -179,7 +171,6 @@ BYTE CDamageManagerSA::GetPanelStatus(BYTE bPanel)
 {
     if (bPanel < MAX_PANELS)
     {
-        DEBUG_TRACE("BYTE CDamageManagerSA::GetPanelStatus ( BYTE bPannel )");
         DWORD dwFunction = FUNC_GetPanelStatus;
         DWORD dwPointer = (DWORD)internalInterface;
         BYTE  bReturn = 0;
@@ -205,7 +196,6 @@ unsigned long CDamageManagerSA::GetPanelStatus()
 
 void CDamageManagerSA::SetLightStatus(BYTE bLight, BYTE bLightStatus)
 {
-    DEBUG_TRACE("BYTE CDamageManagerSA::SetLightStatus ( BYTE bLight, BYTE bLightStatus )");
     DWORD dwFunction = FUNC_SetLightStatus;
     DWORD dwPointer = (DWORD)internalInterface;
     DWORD dwLight = bLight;
@@ -226,7 +216,6 @@ void CDamageManagerSA::SetLightStatus(unsigned char ucStatus)
 
 BYTE CDamageManagerSA::GetLightStatus(BYTE bLight)
 {
-    DEBUG_TRACE("BYTE CDamageManagerSA::GetLightStatus ( BYTE bLight )");
     DWORD dwFunction = FUNC_GetLightStatus;
     DWORD dwPointer = (DWORD)internalInterface;
     BYTE  bReturn = 0;
@@ -248,7 +237,6 @@ unsigned char CDamageManagerSA::GetLightStatus()
 
 void CDamageManagerSA::SetAeroplaneCompStatus(BYTE CompID, BYTE Status)
 {
-    DEBUG_TRACE("VOID CDamageManagerSA::SetAeroplaneCompStatus( BYTE CompID, BYTE Status)");
     DWORD dwFunction = FUNC_SetAeroplaneCompStatus;
     DWORD dwPointer = (DWORD)internalInterface;
     DWORD dwPannel = CompID;
@@ -263,7 +251,6 @@ void CDamageManagerSA::SetAeroplaneCompStatus(BYTE CompID, BYTE Status)
 
 BYTE CDamageManagerSA::GetAeroplaneCompStatus(BYTE CompID)
 {
-    DEBUG_TRACE("BYTE CDamageManagerSA::GetAeroplaneCompStatus( BYTE CompID )");
     DWORD dwFunction = FUNC_GetAeroplaneCompStatus;
     DWORD dwPointer = (DWORD)internalInterface;
     BYTE  bReturn = 0;
@@ -278,9 +265,8 @@ BYTE CDamageManagerSA::GetAeroplaneCompStatus(BYTE CompID)
     return bReturn;
 }
 
-void CDamageManagerSA::FuckCarCompletely(BOOL bKeepWheels)
+void CDamageManagerSA::FuckCarCompletely(bool bKeepWheels)
 {
-    DEBUG_TRACE("VOID CDamageManagerSA::FuckCarCompletely ( BOOL bKeepWheels )");
     DWORD dwFunc = FUNC_FuckCarCompletely;
     DWORD dwPointer = (DWORD)internalInterface;
     _asm
diff --git a/Client/game_sa/CDamageManagerSA.h b/Client/game_sa/CDamageManagerSA.h
index 853c29cab58..33f72aeccc8 100644
--- a/Client/game_sa/CDamageManagerSA.h
+++ b/Client/game_sa/CDamageManagerSA.h
@@ -60,7 +60,7 @@ class CDamageManagerSA : public CDamageManager
     BYTE          GetAeroplaneCompStatus(BYTE CompID);
     void          SetAeroplaneCompStatus(BYTE CompID, BYTE Status);
 
-    void FuckCarCompletely(BOOL bKeepWheels);
+    void FuckCarCompletely(bool bKeepWheels);
 
     CDamageManagerSA(class CEntitySAInterface* intEntityInterface, CDamageManagerSAInterface* intInterface)
     {
diff --git a/Client/game_sa/CDoorSA.cpp b/Client/game_sa/CDoorSA.cpp
index f55b82c58cc..7b67cc4893d 100644
--- a/Client/game_sa/CDoorSA.cpp
+++ b/Client/game_sa/CDoorSA.cpp
@@ -18,7 +18,6 @@
  */
 float CDoorSA::GetAngleOpenRatio()
 {
-    DEBUG_TRACE("FLOAT CDoorSA::GetAngleOpenRatio ( )");
     DWORD dwFunction = FUNC_GetAngleOpenRatio;
     DWORD dwPointer = (DWORD)GetInterface();
     float fReturn = 0.0f;
@@ -40,9 +39,8 @@ float CDoorSA::GetAngleOpenRatio()
  * Checks if the door is closed
  * @return BOOL TRUE if the door is closed, FALSE otherwise
  */
-BOOL CDoorSA::IsClosed()
+bool CDoorSA::IsClosed()
 {
-    DEBUG_TRACE("BOOL CDoorSA::IsClosed (  )");
     DWORD dwFunction = FUNC_IsClosed;
     DWORD dwPointer = (DWORD)GetInterface();
     BYTE  bReturn = 0;
@@ -65,9 +63,8 @@ BOOL CDoorSA::IsClosed()
  * @return BOOL TRUE if the door is fully opened, FALSE if it is opening, is closed or is missing.
  * \todo Check what this returns if the door has been ripped off
  */
-BOOL CDoorSA::IsFullyOpen()
+bool CDoorSA::IsFullyOpen()
 {
-    DEBUG_TRACE("BOOL CDoorSA::IsFullyOpen (  )");
     DWORD dwFunction = FUNC_IsFullyOpen;
     DWORD dwPointer = (DWORD)GetInterface();
     BYTE  bReturn = 0;
@@ -92,7 +89,6 @@ BOOL CDoorSA::IsFullyOpen()
  */
 void CDoorSA::Open(float fOpenRatio)
 {
-    DEBUG_TRACE("VOID CDoorSA::Open ( float fOpenRatio )");
     DWORD dwFunction = FUNC_Open;
     DWORD dwPointer = (DWORD)GetInterface();
 
diff --git a/Client/game_sa/CDoorSA.h b/Client/game_sa/CDoorSA.h
index 5ab2418d5c7..806be7f7732 100644
--- a/Client/game_sa/CDoorSA.h
+++ b/Client/game_sa/CDoorSA.h
@@ -46,8 +46,8 @@ class CDoorSA : public CDoor
     CDoorSAInterface* GetInterface() { return internalInterface; };
 
     float      GetAngleOpenRatio();
-    BOOL       IsClosed();
-    BOOL       IsFullyOpen();
+    bool       IsClosed();
+    bool       IsFullyOpen();
     void       Open(float fOpenRatio);
     eDoorState GetDoorState() { return (eDoorState)this->GetInterface()->m_nDoorState; };
 };
diff --git a/Client/game_sa/CEntitySA.cpp b/Client/game_sa/CEntitySA.cpp
index 3d06f412ff6..b3814e8e47c 100644
--- a/Client/game_sa/CEntitySA.cpp
+++ b/Client/game_sa/CEntitySA.cpp
@@ -99,14 +99,9 @@ bool CEntitySA::SetScaleInternal(const CVector& scale)
     return true;
 }
 
-/*VOID CEntitySA::SetModelAlpha ( int iAlpha )
-{
-    this->internalInterface->ModelClump->SetAlpha(iAlpha);
-}*/
 void CEntitySA::SetPosition(float fX, float fY, float fZ)
 {
     // Remove & add to world?
-    DEBUG_TRACE("VOID CEntitySA::SetPosition(float fX, float fY, float fZ)");
     CVector* vecPos;
     if (m_pInterface->Placeable.matrix)
     {
@@ -146,7 +141,6 @@ void CEntitySA::SetPosition(float fX, float fY, float fZ)
 
 void CEntitySA::Teleport(float fX, float fY, float fZ)
 {
-    DEBUG_TRACE("VOID CEntitySA::Teleport ( float fX, float fY, float fZ )");
     if (m_pInterface->Placeable.matrix)
     {
         SetPosition(fX, fY, fZ);
@@ -171,7 +165,6 @@ void CEntitySA::Teleport(float fX, float fY, float fZ)
 
 void CEntitySA::ProcessControl()
 {
-    DEBUG_TRACE("VOID CEntitySA::ProcessControl ( void )");
     DWORD dwFunc = m_pInterface->vtbl->ProcessControl;
     DWORD dwThis = (DWORD)m_pInterface;
     if (dwFunc)
@@ -186,7 +179,6 @@ void CEntitySA::ProcessControl()
 
 void CEntitySA::SetupLighting()
 {
-    DEBUG_TRACE("VOID CEntitySA::SetupLighting ( )");
     DWORD dwFunc = m_pInterface->vtbl->SetupLighting;
     DWORD dwThis = (DWORD)m_pInterface;
     if (dwFunc)
@@ -201,7 +193,6 @@ void CEntitySA::SetupLighting()
 
 void CEntitySA::Render()
 {
-    DEBUG_TRACE("VOID CEntitySA::Render ( )");
     DWORD dwFunc = 0x59F180;            // m_pInterface->vtbl->Render;
     DWORD dwThis = (DWORD)m_pInterface;
     _asm
@@ -223,7 +214,6 @@ void CEntitySA::Render()
 
 void CEntitySA::SetOrientation(float fX, float fY, float fZ)
 {
-    DEBUG_TRACE("VOID CEntitySA::SetOrientation ( float fX, float fY, float fZ )");
     pGame->GetWorld()->Remove(this, CEntity_SetOrientation);
     DWORD dwThis = (DWORD)m_pInterface;
     DWORD dwFunc = FUNC_SetOrientation;
@@ -263,7 +253,6 @@ void CEntitySA::SetOrientation(float fX, float fY, float fZ)
 
 void CEntitySA::FixBoatOrientation()
 {
-    DEBUG_TRACE("VOID CEntitySA::FixBoatOrientation ( void )");
     pGame->GetWorld()->Remove(this, CEntity_FixBoatOrientation);
     DWORD dwThis = (DWORD)m_pInterface;
     DWORD dwFunc = 0x446F90;
@@ -285,7 +274,6 @@ void CEntitySA::FixBoatOrientation()
 
 void CEntitySA::SetPosition(CVector* vecPosition)
 {
-    DEBUG_TRACE("VOID CEntitySA::SetPosition( CVector * vecPosition )");
     if (vecPosition)
         SetPosition(vecPosition->fX, vecPosition->fY, vecPosition->fZ);
 }
@@ -319,7 +307,6 @@ CVector* CEntitySA::GetPosition()
 
 CVector* CEntitySA::GetPositionInternal()
 {
-    DEBUG_TRACE("CVector * CEntitySA::GetPosition( )");
     if (m_pInterface->Placeable.matrix)
         return &m_pInterface->Placeable.matrix->vPos;
     else
@@ -346,7 +333,6 @@ CMatrix* CEntitySA::GetMatrix(CMatrix* matrix)
 
 CMatrix* CEntitySA::GetMatrixInternal(CMatrix* matrix)
 {
-    DEBUG_TRACE("CMatrix * CEntitySA::GetMatrix ( CMatrix * matrix )");
     if (m_pInterface->Placeable.matrix && matrix)
     {
         MemCpyFast(&matrix->vFront, &m_pInterface->Placeable.matrix->vFront, sizeof(CVector));
@@ -363,8 +349,6 @@ CMatrix* CEntitySA::GetMatrixInternal(CMatrix* matrix)
 
 void CEntitySA::SetMatrix(CMatrix* matrix)
 {
-    DEBUG_TRACE("VOID CEntitySA::SetMatrix ( CMatrix * matrix )");
-
     if (m_pInterface->Placeable.matrix && matrix)
     {
         OnChangingPosition(matrix->vPos);
@@ -420,19 +404,16 @@ void CEntitySA::SetMatrix(CMatrix* matrix)
 
 WORD CEntitySA::GetModelIndex()
 {
-    DEBUG_TRACE("WORD CEntitySA::GetModelIndex ()");
     return m_pInterface->m_nModelIndex;
 }
 
 eEntityType CEntitySA::GetEntityType()
 {
-    DEBUG_TRACE("eEntityType CEntitySA::GetEntityType ()");
     return (eEntityType)m_pInterface->nType;
 }
 
 float CEntitySA::GetDistanceFromCentreOfMassToBaseOfModel()
 {
-    DEBUG_TRACE("FLOAT CEntitySA::GetDistanceFromCentreOfMassToBaseOfModel()");
     DWORD dwFunc = FUNC_GetDistanceFromCentreOfMassToBaseOfModel;
     DWORD dwThis = (DWORD)m_pInterface;
     float fReturn;
@@ -447,13 +428,11 @@ float CEntitySA::GetDistanceFromCentreOfMassToBaseOfModel()
 
 void CEntitySA::SetEntityStatus(eEntityStatus bStatus)
 {
-    DEBUG_TRACE("VOID CEntitySA::SetEntityStatus( eEntityStatus bStatus )");
     m_pInterface->nStatus = bStatus;
 }
 
 eEntityStatus CEntitySA::GetEntityStatus()
 {
-    DEBUG_TRACE("eEntityStatus CEntitySA::GetEntityStatus( )");
     return (eEntityStatus)m_pInterface->nStatus;
 }
 
@@ -493,7 +472,6 @@ RwMatrix* CEntitySA::GetLTMFromId(int id)
 
 void CEntitySA::SetAlpha(DWORD dwAlpha)
 {
-    DEBUG_TRACE("VOID CEntitySA::SetAlpha(DWORD dwAlpha)");
     DWORD dwFunc = FUNC_SetRwObjectAlpha;
     DWORD dwThis = (DWORD)m_pInterface;
     _asm
diff --git a/Client/game_sa/CEntitySA.h b/Client/game_sa/CEntitySA.h
index eee9ce1b3e4..a666fc66a6a 100644
--- a/Client/game_sa/CEntitySA.h
+++ b/Client/game_sa/CEntitySA.h
@@ -281,15 +281,15 @@ class CEntitySA : public virtual CEntity
 
     RpClump* GetRpClump();
 
-    BOOL BeingDeleted;                   // to prevent it trying to delete twice
-    BOOL DoNotRemoveFromGame;            // when deleted, if this is true, it won't be removed from the game
+    bool BeingDeleted;                   // to prevent it trying to delete twice
+    bool DoNotRemoveFromGame;            // when deleted, if this is true, it won't be removed from the game
 
     void SetDoNotRemoveFromGameWhenDeleted(bool bDoNotRemoveFromGame) { DoNotRemoveFromGame = bDoNotRemoveFromGame; };
-    BOOL IsStatic() { return m_pInterface->bIsStatic; }
-    void SetStatic(BOOL bStatic) { m_pInterface->bIsStatic = bStatic; };
-    void SetUsesCollision(BOOL bUsesCollision) { m_pInterface->bUsesCollision = bUsesCollision; };
-    BOOL IsBackfaceCulled() { return m_pInterface->bBackfaceCulled; };
-    void SetBackfaceCulled(BOOL bBackfaceCulled) { m_pInterface->bBackfaceCulled = bBackfaceCulled; };
+    bool IsStatic() { return m_pInterface->bIsStatic; }
+    void SetStatic(bool bStatic) { m_pInterface->bIsStatic = bStatic; };
+    void SetUsesCollision(bool bUsesCollision) { m_pInterface->bUsesCollision = bUsesCollision; };
+    bool IsBackfaceCulled() { return m_pInterface->bBackfaceCulled; };
+    void SetBackfaceCulled(bool bBackfaceCulled) { m_pInterface->bBackfaceCulled = bBackfaceCulled; };
     void SetAlpha(DWORD dwAlpha);
 
     void MatrixConvertFromEulerAngles(float fX, float fY, float fZ, int iUnknown);
diff --git a/Client/game_sa/CEventListSA.cpp b/Client/game_sa/CEventListSA.cpp
index a225d2a4b4f..85632cfa71c 100644
--- a/Client/game_sa/CEventListSA.cpp
+++ b/Client/game_sa/CEventListSA.cpp
@@ -14,57 +14,6 @@
 #include "CEventDamageSA.h"
 #include "CEventGunShotSA.h"
 
-CEvent* CEventListSA::FindClosestEvent(eEventType eventtype, CVector* vecPosition)
-{
-    DEBUG_TRACE("CEvent * CEventListSA::FindClosestEvent ( eEventType eventtype, CVector * vecPosition )");
-    CEventSA* event;
-
-    CVector* vecPos = (CVector*)vecPosition;
-
-    DWORD dwFunction = FUNC_FindClosestEvent;
-    float fX = vecPos->fX;
-    float fY = vecPos->fY;
-    float fZ = vecPos->fZ;
-    DWORD dwReturn;
-    _asm
-    {
-        push    eax
-        lea     eax, dwReturn
-        push    eax
-        push    fZ
-        push    fY
-        push    fX
-        push    eventtype
-        call    dwFunction
-        add     esp, 0x14
-        pop     eax
-    }
-
-    event = (CEventSA*)(ARRAY_CEvent + dwReturn * sizeof(CEventSA));
-    return event;
-}
-
-CEvent* CEventListSA::GetEvent(DWORD ID)
-{
-    DEBUG_TRACE("CEvent * CEventListSA::GetEvent ( DWORD ID )");
-    CEventSA* event;
-    event = (CEventSA*)(ARRAY_CEvent + ID * sizeof(CEventSA));
-    return event;
-}
-
-CEvent* CEventListSA::GetEvent(eEventType eventtype)
-{
-    DEBUG_TRACE("CEvent * CEventListSA::GetEvent ( eEventType eventtype )");
-    CEventSA* event;
-    for (int i = 0; i < MAX_EVENTS; i++)
-    {
-        event = (CEventSA*)(ARRAY_CEvent + i * sizeof(CEventSA));
-        if (event->GetType() == eventtype)
-            return event;
-    }
-    return NULL;
-}
-
 CEventDamage* CEventListSA::GetEventDamage(CEventDamageSAInterface* pInterface)
 {
     return new CEventDamageSA(pInterface);
diff --git a/Client/game_sa/CEventListSA.h b/Client/game_sa/CEventListSA.h
index 7d378acb0e3..ec87d4a9ef2 100644
--- a/Client/game_sa/CEventListSA.h
+++ b/Client/game_sa/CEventListSA.h
@@ -14,17 +14,9 @@
 #include <game/CEventList.h>
 #include "CEventSA.h"
 
-#define FUNC_FindClosestEvent               0x489E70
-
-#define ARRAY_CEvent                        0x7DAAB8
-#define MAX_EVENTS                  		64
-
 class CEventListSA : public CEventList
 {
-    CEvent* FindClosestEvent(eEventType eventtype, CVector* vecPosition);
-    CEvent* GetEvent(DWORD ID);
-    CEvent* GetEvent(eEventType eventtype);
-
+public:
     CEventDamage* GetEventDamage(CEventDamageSAInterface* pInterface);
 
     CEventDamage* CreateEventDamage(CEntity* pEntity, unsigned int i_1, eWeaponType weaponType, ePedPieceTypes hitZone, unsigned char uc_2, bool b_3, bool b_4);
diff --git a/Client/game_sa/CEventSA.cpp b/Client/game_sa/CEventSA.cpp
index e925394051c..3a20492641e 100644
--- a/Client/game_sa/CEventSA.cpp
+++ b/Client/game_sa/CEventSA.cpp
@@ -15,13 +15,11 @@
 
 eEventEntityType CEventSA::GetType()
 {
-    DEBUG_TRACE("eEventEntityType CEventSA::GetType (  )");
     return m_pInterface->m_eEventType;
 }
 
 CEntity* CEventSA::GetEntity()
 {
-    DEBUG_TRACE("CEntity * CEventSA::GetEntity (  )");
     if (this->GetEntityType() == EVENT_NULL)
         return NULL;
 
@@ -47,18 +45,15 @@ CEntity* CEventSA::GetEntity()
 
 eEventEntity CEventSA::GetEntityType()
 {
-    DEBUG_TRACE("eEventEntity CEventSA::GetEntityType (  )");
     return m_pInterface->m_eEventEntity;
 }
 
 CEntity* CEventSA::GetCommittedBy()
 {
-    DEBUG_TRACE("CEntity * CEventSA::GetCommittedBy (  )");
     return m_pInterface->m_pCommitedBy;
 }
 
 CVector* CEventSA::GetPosition()
 {
-    DEBUG_TRACE("CVector * CEventSA::GetPosition (  )");
     return &m_pInterface->m_vecEventPosition;
 }
diff --git a/Client/game_sa/CExplosionManagerSA.cpp b/Client/game_sa/CExplosionManagerSA.cpp
index bb24bc3167f..34e33717d22 100644
--- a/Client/game_sa/CExplosionManagerSA.cpp
+++ b/Client/game_sa/CExplosionManagerSA.cpp
@@ -16,7 +16,6 @@
 
 CExplosionManagerSA::CExplosionManagerSA()
 {
-    DEBUG_TRACE("CExplosionManagerSA::CExplosionManagerSA()");
     for (int i = 0; i < MAX_EXPLOSIONS; i++)
         Explosions[i] = new CExplosionSA((CExplosionSAInterface*)(ARRAY_Explosions + i * sizeof(CExplosionSAInterface)));
 }
@@ -35,7 +34,6 @@ CExplosionManagerSA::~CExplosionManagerSA()
 CExplosion* CExplosionManagerSA::AddExplosion(CEntity* pExplodingEntity, CEntity* pOwner, eExplosionType explosionType, CVector& vecPosition,
                                               unsigned int uiActivationDelay, bool bMakeSound, float fCamShake, bool bNoDamage)
 {
-    DEBUG_TRACE("CExplosion * CExplosionManagerSA::AddExplosion ( eExplosionType explosiontype, CVector * vecPosition, CEntity * creator = NULL)");
     DWORD       dwExplodingEntityInterface = (pExplodingEntity) ? (DWORD)pExplodingEntity->GetInterface() : 0;
     DWORD       dwOwnerInterface = (pOwner) ? (DWORD)pOwner->GetInterface() : 0;
     float       fX = vecPosition.fX, fY = vecPosition.fY, fZ = vecPosition.fZ;
@@ -77,7 +75,6 @@ CExplosion* CExplosionManagerSA::AddExplosion(CEntity* pExplodingEntity, CEntity
 
 void CExplosionManagerSA::RemoveAllExplosions()
 {
-    DEBUG_TRACE("VOID CExplosionManagerSA::RemoveAllExplosions (  )");
     for (int i = 0; i < MAX_EXPLOSIONS; i++)
         if (Explosions[i]->IsActive())
             Explosions[i]->Remove();
@@ -85,13 +82,11 @@ void CExplosionManagerSA::RemoveAllExplosions()
 
 CExplosion* CExplosionManagerSA::GetExplosion(DWORD ID)
 {
-    DEBUG_TRACE("CExplosion * CExplosionManagerSA::GetExplosion ( DWORD ID )");
     return Explosions[ID];
 }
 
 CExplosion* CExplosionManagerSA::FindFreeExplosion()
 {
-    DEBUG_TRACE("CExplosion * CExplosionManagerSA::FindFreeExplosion (  )");
     for (int i = 0; i < MAX_EXPLOSIONS; i++)
         if (!Explosions[i]->IsActive())
             return Explosions[i];
diff --git a/Client/game_sa/CExplosionSA.cpp b/Client/game_sa/CExplosionSA.cpp
index feb726368d3..337dd5682d3 100644
--- a/Client/game_sa/CExplosionSA.cpp
+++ b/Client/game_sa/CExplosionSA.cpp
@@ -16,13 +16,11 @@
 
 eExplosionType CExplosionSA::GetExplosionType()
 {
-    DEBUG_TRACE("eExplosionType CExplosionSA::GetExplosionType (  )");
     return internalInterface->m_ExplosionType;
 }
 
 CVector* CExplosionSA::GetExplosionPosition()
 {
-    DEBUG_TRACE("CVector * CExplosionSA::GetExplosionPosition (  )");
     return &internalInterface->m_vecPosition;
 }
 
@@ -36,8 +34,6 @@ void CExplosionSA::SetExplosionPosition(const CVector* vecPosition)
  */
 CEntity* CExplosionSA::GetExplosionCreator()
 {
-    DEBUG_TRACE("CEntity * CExplosionSA::GetExplosionCreator (  )");
-
     eEntityType entityType = (eEntityType)GetInterface()->m_pEntExplosionOwner->nType;
 
     CPools* pools = pGame->GetPools();
@@ -74,68 +70,57 @@ CEntity* CExplosionSA::GetExplodingEntity()
     return NULL;
 }
 
-BOOL CExplosionSA::IsActive()
+bool CExplosionSA::IsActive()
 {
-    DEBUG_TRACE("BOOL CExplosionSA::IsActive (  )");
     return internalInterface->m_cExplosionActive;
 }
 
 void CExplosionSA::Remove()
 {
-    DEBUG_TRACE("VOID CExplosionSA::Remove (  )");
     internalInterface->m_cExplosionActive = 0;
 }
 
 float CExplosionSA::GetExplosionForce()
 {
-    DEBUG_TRACE("FLOAT CExplosionSA::GetExplosionForce()");
     return this->GetInterface()->m_fExplosionForce;
 }
 
 void CExplosionSA::SetExplosionForce(float fForce)
 {
-    DEBUG_TRACE("VOID CExplosionSA::SetExplosionForce(FLOAT fForce)");
     this->GetInterface()->m_fExplosionForce = fForce;
 }
 
 void CExplosionSA::SetSilent(bool bSilent)
 {
-    DEBUG_TRACE("VOID CExplosionSA::SetSilent(BOOL bSilent)");
     this->GetInterface()->m_bMakeSound = !bSilent;
 }
 
 unsigned long CExplosionSA::GetActivationTimer()
 {
-    DEBUG_TRACE("DWORD CExplosionSA::GetActivationTimer()");
     return this->GetInterface()->m_ActivationTime;
 }
 
 void CExplosionSA::SetActivationTimer(unsigned long ulActivationTime)
 {
-    DEBUG_TRACE("VOID CExplosionSA::SetActivationTimer( DWORD dwActivationTime )");
     this->GetInterface()->m_ActivationTime = ulActivationTime;
 }
 
 DWORD CExplosionSA::GetExpiryTime()
 {
-    DEBUG_TRACE("DWORD CExplosionSA::GetExpiryTime()");
     return this->GetInterface()->m_TimeExpires;
 }
 
 void CExplosionSA::SetExpiryTime(DWORD dwExpiryTime)
 {
-    DEBUG_TRACE("VOID CExplosionSA::SetExpiryTime( DWORD dwExpiryTime )");
     this->GetInterface()->m_TimeExpires = dwExpiryTime;
 }
 
 float CExplosionSA::GetExplosionRadius()
 {
-    DEBUG_TRACE("FLOAT CExplosionSA::GetExplosionRadius()");
     return this->GetInterface()->m_fExplosionRadius;
 }
 
 void CExplosionSA::SetExplosionRadius(float fRadius)
 {
-    DEBUG_TRACE("VOID CExplosionSA::SetExplosionRadius( FLOAT fRadius )");
     this->GetInterface()->m_fExplosionRadius = fRadius;
 }
diff --git a/Client/game_sa/CExplosionSA.h b/Client/game_sa/CExplosionSA.h
index b2321a7631c..6edc10360a1 100644
--- a/Client/game_sa/CExplosionSA.h
+++ b/Client/game_sa/CExplosionSA.h
@@ -54,7 +54,7 @@ class CExplosionSA : public CExplosion
     void           SetExplosionPosition(const CVector* vecPosition);
     CEntity*       GetExplosionCreator();
     CEntity*       GetExplodingEntity();
-    BOOL           IsActive();
+    bool           IsActive();
     void           Remove();
     float          GetExplosionForce();
     void           SetExplosionForce(float fForce);
diff --git a/Client/game_sa/CFireManagerSA.cpp b/Client/game_sa/CFireManagerSA.cpp
index f94569e1da4..39dd43b0b01 100644
--- a/Client/game_sa/CFireManagerSA.cpp
+++ b/Client/game_sa/CFireManagerSA.cpp
@@ -17,7 +17,6 @@ extern CGameSA* pGame;
 
 CFireManagerSA::CFireManagerSA()
 {
-    DEBUG_TRACE("CFireManagerSA::CFireManagerSA()");
     for (int i = 0; i < MAX_FIRES; i++)
         this->Fires[i] = new CFireSA(
             (CFireSAInterface*)(CLASS_CFireManager + 40 * i));            // + 4 because thats the position of CFire array in CFireManager (see source)
@@ -33,7 +32,6 @@ CFireManagerSA::~CFireManagerSA()
 
 void CFireManagerSA::ExtinguishPoint(CVector& vecPosition, float fRadius)
 {
-    DEBUG_TRACE("VOID CFireManagerSA::ExtinguishPoint ( CVector & vecPosition, float fRadius )");
     float fX = vecPosition.fX;
     float fY = vecPosition.fY;
     float fZ = vecPosition.fZ;
@@ -52,7 +50,6 @@ void CFireManagerSA::ExtinguishPoint(CVector& vecPosition, float fRadius)
 
 CFire* CFireManagerSA::StartFire(CEntity* entityTarget, CEntity* entityCreator, float fSize = DEFAULT_FIRE_PARTICLE_SIZE)
 {
-    DEBUG_TRACE("CFire * CFireManagerSA::StartFire ( CEntity * entityTarget, CEntity * entityCreator, float fSize = DEFAULT_FIRE_PARTICLE_SIZE )");
     CFire* fire = this->FindFreeFire();
 
     if (fire != NULL)
@@ -60,7 +57,7 @@ CFire* CFireManagerSA::StartFire(CEntity* entityTarget, CEntity* entityCreator,
         fire->SetTarget(entityTarget);
         fire->SetStrength(fSize);
         fire->SetTimeToBurnOut(pGame->GetSystemTime() + 5000);
-        fire->SetSilent(FALSE);
+        fire->SetSilent(false);
         fire->Ignite();
     }
 
@@ -69,7 +66,6 @@ CFire* CFireManagerSA::StartFire(CEntity* entityTarget, CEntity* entityCreator,
 
 CFire* CFireManagerSA::StartFire(CVector& vecPosition, float fSize = DEFAULT_FIRE_PARTICLE_SIZE)
 {
-    DEBUG_TRACE("CFire * CFireManagerSA::StartFire ( CVector & vecPosition, float fSize = DEFAULT_FIRE_PARTICLE_SIZE )");
     CFire* fire = this->FindFreeFire();
 
     if (fire != NULL)
@@ -77,7 +73,7 @@ CFire* CFireManagerSA::StartFire(CVector& vecPosition, float fSize = DEFAULT_FIR
         fire->SetPosition(vecPosition);
         fire->SetStrength(fSize);
         fire->SetTimeToBurnOut(pGame->GetSystemTime() + 5000);
-        fire->SetSilent(FALSE);
+        fire->SetSilent(false);
         fire->Ignite();
     }
 
@@ -86,7 +82,6 @@ CFire* CFireManagerSA::StartFire(CVector& vecPosition, float fSize = DEFAULT_FIR
 
 void CFireManagerSA::ExtinguishAllFires()
 {
-    DEBUG_TRACE("VOID CFireManagerSA::ExtinguishAllFires (  )");
     CFireSA* fire;
     for (int i = 0; i < MAX_FIRES; i++)
     {
@@ -98,7 +93,6 @@ void CFireManagerSA::ExtinguishAllFires()
 
 CFire* CFireManagerSA::GetFire(DWORD ID)
 {
-    DEBUG_TRACE("CFire * CFireManagerSA::GetFire ( DWORD ID )");
     if (ID < MAX_FIRES)
         return Fires[ID];
     else
@@ -107,13 +101,11 @@ CFire* CFireManagerSA::GetFire(DWORD ID)
 
 DWORD CFireManagerSA::GetFireCount()
 {
-    DEBUG_TRACE("DWORD CFireManagerSA::GetFireCount (  )");
     return *(DWORD*)CLASS_CFireManager;
 }
 
 CFire* CFireManagerSA::FindFreeFire()
 {
-    DEBUG_TRACE("CFire * CFireManagerSA::FindFreeFire (  )");
     CFireSA* fire;
     for (int i = 0; i < MAX_FIRES; i++)
     {
@@ -126,7 +118,6 @@ CFire* CFireManagerSA::FindFreeFire()
 
 CFire* CFireManagerSA::GetFire(CFireSAInterface* fire)
 {
-    DEBUG_TRACE("CFire * CFireManagerSA::GetFire ( CFireSAInterface * fire )");
     DWORD dwID = ((DWORD)fire - CLASS_CFireManager + 4) / sizeof(CFireSAInterface);
     return GetFire(dwID);
 }
diff --git a/Client/game_sa/CFireSA.cpp b/Client/game_sa/CFireSA.cpp
index 87f7006352d..9889306bf27 100644
--- a/Client/game_sa/CFireSA.cpp
+++ b/Client/game_sa/CFireSA.cpp
@@ -19,7 +19,6 @@
  */
 void CFireSA::Extinguish()
 {
-    DEBUG_TRACE("VOID CFireSA::Extinguish (  )");
     DWORD dwFunction = FUNC_Extinguish;
     DWORD dwPointer = (DWORD)this->internalInterface;
     _asm
@@ -27,7 +26,7 @@ void CFireSA::Extinguish()
         mov     ecx, dwPointer
         call    dwFunction
     }
-    this->internalInterface->bActive = FALSE;
+    this->internalInterface->bActive = false;
 }
 
 /**
@@ -36,7 +35,6 @@ void CFireSA::Extinguish()
  */
 CVector* CFireSA::GetPosition()
 {
-    DEBUG_TRACE("CVector * CFireSA::GetPosition ( )");
     return &internalInterface->vecPosition;
 }
 
@@ -47,7 +45,6 @@ CVector* CFireSA::GetPosition()
  */
 void CFireSA::SetPosition(CVector& vecPosition)
 {
-    DEBUG_TRACE("VOID CFireSA::SetPosition ( CVector & vecPosition )");
     this->internalInterface->entityTarget = 0;
     MemCpyFast(&internalInterface->vecPosition, &vecPosition, sizeof(CVector));
 }
@@ -58,19 +55,16 @@ void CFireSA::SetPosition(CVector& vecPosition)
  */
 void CFireSA::SetTimeToBurnOut(DWORD dwTime)
 {
-    DEBUG_TRACE("VOID CFireSA::SetTimeToBurnOut ( DWORD dwTime )");
     internalInterface->nTimeToBurn = dwTime;
 }
 
 DWORD CFireSA::GetTimeToBurnOut()
 {
-    DEBUG_TRACE("DWORD CFireSA::GetTimeToBurnOut (  )");
     return internalInterface->nTimeToBurn;
 }
 
 CEntity* CFireSA::GetCreator()
 {
-    DEBUG_TRACE("CEntity * CFireSA::GetCreator (  )");
     CEntity*            creatorEntity = NULL;
     CEntitySAInterface* createEntitySA = internalInterface->entityCreator;
     CPoolsSA*           pPools = ((CPoolsSA*)pGame->GetPools());
@@ -107,7 +101,6 @@ CEntity* CFireSA::GetCreator()
 
 CEntity* CFireSA::GetEntityOnFire()
 {
-    DEBUG_TRACE("CEntity * CFireSA::GetEntityOnFire (  )");
     CEntity*            TargetEntity = NULL;
     CEntitySAInterface* TargetEntitySA = internalInterface->entityTarget;
     CPoolsSA*           pPools = ((CPoolsSA*)pGame->GetPools());
@@ -144,8 +137,6 @@ CEntity* CFireSA::GetEntityOnFire()
 
 void CFireSA::SetTarget(CEntity* entity)
 {
-    DEBUG_TRACE("VOID CFireSA::SetTarget ( CEntity * entity  )");
-
     if (entity)
     {
         CEntitySA* pEntitySA = dynamic_cast<CEntitySA*>(entity);
@@ -158,37 +149,32 @@ void CFireSA::SetTarget(CEntity* entity)
     }
 }
 
-BOOL CFireSA::IsIgnited()
+bool CFireSA::IsIgnited()
 {
-    DEBUG_TRACE("BOOL CFireSA::IsIgnited (  )");
     return internalInterface->bActive;
 }
 
-BOOL CFireSA::IsFree()
+bool CFireSA::IsFree()
 {
-    DEBUG_TRACE("BOOL CFireSA::IsFree (  )");
     if (!internalInterface->bActive && !internalInterface->bCreatedByScript)
-        return TRUE;
+        return true;
     else
-        return FALSE;
+        return false;
 }
 
-void CFireSA::SetSilent(BOOL bSilent)
+void CFireSA::SetSilent(bool bSilent)
 {
-    DEBUG_TRACE("VOID CFireSA::SetSilent ( BOOL bSilent )");
     internalInterface->bMakesNoise = !bSilent;
 }
 
-BOOL CFireSA::IsBeingExtinguished()
+bool CFireSA::IsBeingExtinguished()
 {
-    DEBUG_TRACE("BOOL CFireSA::IsBeingExtinguished (  )");
     return internalInterface->bBeingExtinguished;
 }
 
 void CFireSA::Ignite()
 {
-    DEBUG_TRACE("VOID CFireSA::Ignite( )");
-    this->internalInterface->bActive = TRUE;
+    this->internalInterface->bActive = true;
 
     CVector* vecPosition = this->GetPosition();
     DWORD    dwFunc = FUNC_CreateFxSysForStrength;
@@ -208,18 +194,15 @@ void CFireSA::Ignite()
 
 float CFireSA::GetStrength()
 {
-    DEBUG_TRACE("FLOAT CFireSA::GetStrength (  )");
     return this->internalInterface->Strength;
 }
 
 void CFireSA::SetStrength(float fStrength)
 {
-    DEBUG_TRACE("VOID CFireSA::SetStrength ( FLOAT fStrength )");
     this->internalInterface->Strength = fStrength;
 }
 
 void CFireSA::SetNumGenerationsAllowed(char generations)
 {
-    DEBUG_TRACE("VOID CFireSA::SetNumGenerationsAllowed ( char generations )");
     this->internalInterface->nNumGenerationsAllowed = generations;
 }
diff --git a/Client/game_sa/CFireSA.h b/Client/game_sa/CFireSA.h
index f42ab16e5d8..d4d0b55e5ef 100644
--- a/Client/game_sa/CFireSA.h
+++ b/Client/game_sa/CFireSA.h
@@ -54,10 +54,10 @@ class CFireSA : public CFire
     CEntity*        GetCreator();
     CEntity*        GetEntityOnFire();
     void            SetTarget(CEntity* entity);
-    BOOL            IsIgnited();
-    BOOL            IsFree();
-    void            SetSilent(BOOL bSilent);
-    BOOL            IsBeingExtinguished();
+    bool            IsIgnited();
+    bool            IsFree();
+    void            SetSilent(bool bSilent);
+    bool            IsBeingExtinguished();
     void            Ignite();
     float           GetStrength();
     void            SetStrength(float fStrength);
diff --git a/Client/game_sa/CGameSA.cpp b/Client/game_sa/CGameSA.cpp
index f8527a08fb1..edfcdf11c5a 100644
--- a/Client/game_sa/CGameSA.cpp
+++ b/Client/game_sa/CGameSA.cpp
@@ -116,7 +116,6 @@ CGameSA::CGameSA()
         ObjectGroupsInfo[i].SetGroup(i);
     }
 
-    DEBUG_TRACE("CGameSA::CGameSA()");
     this->m_pAudioEngine = new CAudioEngineSA((CAudioEngineSAInterface*)CLASS_CAudioEngine);
     this->m_pAEAudioHardware = new CAEAudioHardwareSA((CAEAudioHardwareSAInterface*)CLASS_CAEAudioHardware);
     this->m_pAESoundManager = new CAESoundManagerSA((CAESoundManagerSAInterface*)CLASS_CAESoundManager);
@@ -303,8 +302,6 @@ CGameSA::~CGameSA()
 
 CWeaponInfo* CGameSA::GetWeaponInfo(eWeaponType weapon, eWeaponSkill skill)
 {
-    DEBUG_TRACE("CWeaponInfo * CGameSA::GetWeaponInfo(eWeaponType weapon)");
-
     if ((skill == WEAPONSKILL_STD && weapon >= WEAPONTYPE_UNARMED && weapon < WEAPONTYPE_LAST_WEAPONTYPE) ||
         (skill != WEAPONSKILL_STD && weapon >= WEAPONTYPE_PISTOL && weapon <= WEAPONTYPE_TEC9))
     {
@@ -339,7 +336,6 @@ void CGameSA::Pause(bool bPaused)
 
 CModelInfo* CGameSA::GetModelInfo(DWORD dwModelID, bool bCanBeInvalid)
 {
-    DEBUG_TRACE("CModelInfo * CGameSA::GetModelInfo(DWORD dwModelID, bool bCanBeInvalid)");
     if (dwModelID < GetCountOfAllFileIDs())
     {
         if (ModelInfo[dwModelID].IsValid() || bCanBeInvalid)
@@ -357,7 +353,6 @@ CModelInfo* CGameSA::GetModelInfo(DWORD dwModelID, bool bCanBeInvalid)
  */
 void CGameSA::StartGame()
 {
-    DEBUG_TRACE("VOID CGameSA::StartGame()");
     this->SetSystemState(GS_INIT_PLAYING_GAME);
     MemPutFast<BYTE>(0xB7CB49, 0); // CTimer::m_UserPause
     MemPutFast<BYTE>(0xBA67A4, 0); // FrontEndMenuManager + 0x5C
@@ -369,13 +364,11 @@ void CGameSA::StartGame()
  */
 void CGameSA::SetSystemState(eSystemState State)
 {
-    DEBUG_TRACE("VOID CGameSA::SetSystemState( eSystemState State )");
     *VAR_SystemState = (DWORD)State;
 }
 
 eSystemState CGameSA::GetSystemState()
 {
-    DEBUG_TRACE("eSystemState CGameSA::GetSystemState( )");
     return (eSystemState)*VAR_SystemState;
 }
 
@@ -383,10 +376,8 @@ eSystemState CGameSA::GetSystemState()
  * This adds the local player to the ped pool, nothing else
  * @return BOOL TRUE if success, FALSE otherwise
  */
-BOOL CGameSA::InitLocalPlayer(CClientPed* pClientPed)
+bool CGameSA::InitLocalPlayer(CClientPed* pClientPed)
 {
-    DEBUG_TRACE("BOOL CGameSA::InitLocalPlayer(  )");
-
     CPoolsSA* pools = (CPoolsSA*)this->GetPools();
     if (pools)
     {
@@ -400,9 +391,9 @@ BOOL CGameSA::InitLocalPlayer(CClientPed* pClientPed)
             return TRUE;
         }
 
-        return FALSE;
+        return false;
     }
-    return FALSE;
+    return true;
 }
 
 float CGameSA::GetGravity()
@@ -933,7 +924,6 @@ CPed* CGameSA::GetPedContext()
 
 CObjectGroupPhysicalProperties* CGameSA::GetObjectGroupPhysicalProperties(unsigned char ucObjectGroup)
 {
-    DEBUG_TRACE("CObjectGroupPhysicalProperties * CGameSA::GetObjectGroupPhysicalProperties(unsigned char ucObjectGroup)");
     if (ucObjectGroup < OBJECTDYNAMICINFO_MAX && ObjectGroupsInfo[ucObjectGroup].IsValid())
         return &ObjectGroupsInfo[ucObjectGroup];
 
diff --git a/Client/game_sa/CGameSA.h b/Client/game_sa/CGameSA.h
index e0b7379dd88..3888cea6274 100644
--- a/Client/game_sa/CGameSA.h
+++ b/Client/game_sa/CGameSA.h
@@ -178,12 +178,9 @@ class CGameSA : public CGame
         return *VAR_SystemTime;
     }
 
-    BOOL IsAtMenu()
+    bool IsAtMenu()
     {
-        if (*VAR_IsAtMenu)
-            return TRUE;
-        else
-            return FALSE;
+        return *VAR_IsAtMenu != 0;
     }
 
     void         StartGame();
@@ -204,7 +201,7 @@ class CGameSA : public CGame
     float GetTimeScale();
     void  SetTimeScale(float fTimeScale);
 
-    BOOL InitLocalPlayer(class CClientPed* pClientPed);
+    bool InitLocalPlayer(class CClientPed* pClientPed);
 
     float GetGravity();
     void  SetGravity(float fGravity);
diff --git a/Client/game_sa/CHudSA.cpp b/Client/game_sa/CHudSA.cpp
index 7953d40f9de..170855388a4 100644
--- a/Client/game_sa/CHudSA.cpp
+++ b/Client/game_sa/CHudSA.cpp
@@ -38,7 +38,6 @@ CHudSA::CHudSA()
 
 void CHudSA::Disable(bool bDisabled)
 {
-    DEBUG_TRACE("VOID CHudSA::Disable ( bool bDisabled )");
     if (bDisabled)
         MemPut<BYTE>(FUNC_Draw, 0xC3);
     else
diff --git a/Client/game_sa/CMarkerSA.cpp b/Client/game_sa/CMarkerSA.cpp
index dcaf49f5ea7..034cf43575e 100644
--- a/Client/game_sa/CMarkerSA.cpp
+++ b/Client/game_sa/CMarkerSA.cpp
@@ -17,16 +17,16 @@ void CMarkerSA::Init()
 {
     internalInterface->position = CVector(0, 0, 0);
     internalInterface->BlipType = (BYTE)MARKER_TYPE_COORDS;
-    internalInterface->bBlipRemain = FALSE;
+    internalInterface->bBlipRemain = false;
     //  internalInterface->nColour = MARKER_COLOR_BLUE;
     //  internalInterface->bBright = TRUE;
-    internalInterface->bTrackingBlip = TRUE;
-    internalInterface->bShortRange = FALSE;
-    internalInterface->bFriendly = FALSE;
+    internalInterface->bTrackingBlip = true;
+    internalInterface->bShortRange = false;
+    internalInterface->bFriendly = false;
     internalInterface->fBlipMarkerScale = 2.0f;
     internalInterface->PoolIndex = 0;
     internalInterface->nBlipScale = 2;
-    internalInterface->bBlipFade = FALSE;
+    internalInterface->bBlipFade = false;
     internalInterface->nBlipDisplayFlag = MARKER_DISPLAY_BLIPONLY;
     internalInterface->nBlipSprite = RADAR_SPRITE_NONE;
     #define COORD_BLIP_APPEARANCE_NORMAL 0
@@ -40,7 +40,6 @@ void CMarkerSA::Init()
  */
 void CMarkerSA::SetSprite(eMarkerSprite Sprite = (eMarkerSprite)MARKER_SPRITE_NONE)
 {
-    DEBUG_TRACE("VOID CMarkerSA::SetSprite ( eMarkerSprite Sprite = (eMarkerSprite)MARKER_SPRITE_NONE )");
     if (Sprite >= MARKER_SPRITE_NONE && Sprite <= MARKER_SPRITE_SPRAY)
     {
         internalInterface->nBlipSprite = Sprite;
@@ -52,7 +51,6 @@ void CMarkerSA::SetSprite(eMarkerSprite Sprite = (eMarkerSprite)MARKER_SPRITE_NO
  */
 void CMarkerSA::SetDisplay(eMarkerDisplay wDisplay)
 {
-    DEBUG_TRACE("VOID CMarkerSA::SetDisplay ( eMarkerDisplay wDisplay )");
     internalInterface->nBlipDisplayFlag = wDisplay;
 }
 
@@ -62,7 +60,6 @@ void CMarkerSA::SetDisplay(eMarkerDisplay wDisplay)
  */
 void CMarkerSA::SetScale(WORD wScale = MARKER_SCALE_NORMAL)
 {
-    DEBUG_TRACE("VOID CMarkerSA::SetScale ( WORD wScale = MARKER_SCALE_NORMAL)");
     internalInterface->nBlipScale = wScale;
     internalInterface->fBlipMarkerScale = 20.0f;
 }
@@ -73,7 +70,6 @@ void CMarkerSA::SetScale(WORD wScale = MARKER_SCALE_NORMAL)
  */
 void CMarkerSA::SetColor(eMarkerColor color)
 {
-    DEBUG_TRACE("VOID CMarkerSA::SetColor ( eMarkerColor color )");
     if (color >= MARKER_COLOR_PLUM && color <= MARKER_COLOR_DARK_TURQUOISE)
     {
         if (color >= MARKER_COLOR_RED && color <= MARKER_COLOR_DARK_TURQUOISE)
@@ -95,7 +91,6 @@ void CMarkerSA::SetColor(eMarkerColor color)
  */
 void CMarkerSA::SetColor(const SharedUtil::SColor color)
 {
-    DEBUG_TRACE("VOID CMarkerSA::SetColor ( RGBA color )");
     // Convert to required rgba at the last moment
     internalInterface->nColour = color.R << 24 | color.G << 16 | color.B << 8 | color.A;
 }
@@ -105,31 +100,24 @@ void CMarkerSA::SetColor(const SharedUtil::SColor color)
  */
 void CMarkerSA::Remove()
 {
-    DEBUG_TRACE("VOID CMarkerSA::Remove ( )");
     internalInterface->BlipType = MARKER_TYPE_UNUSED;
     internalInterface->nBlipDisplayFlag = MARKER_DISPLAY_NEITHER;
     internalInterface->nBlipSprite = MARKER_SPRITE_NONE;
     internalInterface->bTrackingBlip = false;
 }
 
-BOOL CMarkerSA::IsActive()
+bool CMarkerSA::IsActive()
 {
-    DEBUG_TRACE("BOOL CMarkerSA::IsActive (  )");
-    if (internalInterface->BlipType != MARKER_TYPE_UNUSED)
-        return TRUE;
-    else
-        return FALSE;
+    return internalInterface->BlipType != MARKER_TYPE_UNUSED;
 }
 
 void CMarkerSA::SetPosition(CVector* vecPosition)
 {
-    DEBUG_TRACE("VOID CMarkerSA::SetPosition ( CVector * vecPosition )");
     MemCpyFast(&internalInterface->position, vecPosition, sizeof(CVector));
 }
 
 void CMarkerSA::SetEntity(CVehicle* vehicle)
 {
-    DEBUG_TRACE("VOID CMarkerSA::SetEntity ( CVehicle * vehicle )");
     CPoolsSA* pPools = (CPoolsSA*)pGame->GetPools();
     DWORD     dwID = pPools->GetVehicleRef((CVehicle*)vehicle);
     internalInterface->PoolIndex = dwID;
@@ -138,7 +126,6 @@ void CMarkerSA::SetEntity(CVehicle* vehicle)
 
 void CMarkerSA::SetEntity(CPed* ped)
 {
-    DEBUG_TRACE("VOID CMarkerSA::SetEntity ( CPed * ped )");
     CPoolsSA* pPools = (CPoolsSA*)pGame->GetPools();
     DWORD     dwID = pPools->GetPedRef((CPed*)ped);
     internalInterface->PoolIndex = dwID;
@@ -147,7 +134,6 @@ void CMarkerSA::SetEntity(CPed* ped)
 
 void CMarkerSA::SetEntity(CObject* object)
 {
-    DEBUG_TRACE("VOID CMarkerSA::SetEntity ( CObject * object )");
     CPoolsSA* pPools = (CPoolsSA*)pGame->GetPools();
     DWORD     dwID = pPools->GetObjectRef((CObject*)object);
     internalInterface->PoolIndex = dwID;
@@ -156,7 +142,6 @@ void CMarkerSA::SetEntity(CObject* object)
 
 CEntity* CMarkerSA::GetEntity()
 {
-    DEBUG_TRACE("CEntity * CMarkerSA::GetEntity (  )");
     CPoolsSA* pPools = (CPoolsSA*)pGame->GetPools();
 
     switch (internalInterface->BlipType)
@@ -174,6 +159,5 @@ CEntity* CMarkerSA::GetEntity()
 
 CVector* CMarkerSA::GetPosition()
 {
-    DEBUG_TRACE("CVector * CMarkerSA::GetPosition (  )");
     return &internalInterface->position;
 }
diff --git a/Client/game_sa/CMarkerSA.h b/Client/game_sa/CMarkerSA.h
index f9a8fa4e48a..7b99db2c345 100644
--- a/Client/game_sa/CMarkerSA.h
+++ b/Client/game_sa/CMarkerSA.h
@@ -58,7 +58,7 @@ class CMarkerSA : public CMarker
     void                SetColor(eMarkerColor color);
     void                SetColor(const SharedUtil::SColor color);
     void                Remove();
-    BOOL                IsActive();
+    bool                IsActive();
     void                SetPosition(CVector* vecPosition);
     void                SetEntity(CVehicle* vehicle);
     void                SetEntity(CPed* ped);
diff --git a/Client/game_sa/CModelInfoSA.cpp b/Client/game_sa/CModelInfoSA.cpp
index bbecf01cecc..8679079bbec 100644
--- a/Client/game_sa/CModelInfoSA.cpp
+++ b/Client/game_sa/CModelInfoSA.cpp
@@ -65,12 +65,11 @@ CBaseModelInfoSAInterface* CModelInfoSA::GetInterface()
     return m_pInterface = ppModelInfo[m_dwModelID];
 }
 
-BOOL CModelInfoSA::IsBoat()
+bool CModelInfoSA::IsBoat()
 {
-    DEBUG_TRACE("BOOL CModelInfoSA::IsBoat ( )");
     DWORD dwFunction = FUNC_IsBoatModel;
     DWORD ModelID = m_dwModelID;
-    BYTE  bReturn = 0;
+    bool bReturn = false;
     _asm
     {
         push    ModelID
@@ -78,15 +77,14 @@ BOOL CModelInfoSA::IsBoat()
         mov     bReturn, al
         add     esp, 4
     }
-    return (BOOL)bReturn;
+    return bReturn;
 }
 
-BOOL CModelInfoSA::IsCar()
+bool CModelInfoSA::IsCar()
 {
-    DEBUG_TRACE("BOOL CModelInfoSA::IsCar ( )");
     DWORD dwFunction = FUNC_IsCarModel;
     DWORD ModelID = m_dwModelID;
-    BYTE  bReturn = 0;
+    bool  bReturn = false;
     _asm
     {
         push    ModelID
@@ -94,15 +92,14 @@ BOOL CModelInfoSA::IsCar()
         mov     bReturn, al
         add     esp, 4
     }
-    return (BOOL)bReturn;
+    return bReturn;
 }
 
-BOOL CModelInfoSA::IsTrain()
+bool CModelInfoSA::IsTrain()
 {
-    DEBUG_TRACE("BOOL CModelInfoSA::IsTrain ( )");
     DWORD dwFunction = FUNC_IsTrainModel;
     DWORD ModelID = m_dwModelID;
-    BYTE  bReturn = 0;
+    bool  bReturn = false;
     _asm
     {
         push    ModelID
@@ -110,15 +107,14 @@ BOOL CModelInfoSA::IsTrain()
         mov     bReturn, al
         add     esp, 4
     }
-    return (BOOL)bReturn;
+    return bReturn;
 }
 
-BOOL CModelInfoSA::IsHeli()
+bool CModelInfoSA::IsHeli()
 {
-    DEBUG_TRACE("BOOL CModelInfoSA::IsHeli ( )");
     DWORD dwFunction = FUNC_IsHeliModel;
     DWORD ModelID = m_dwModelID;
-    BYTE  bReturn = 0;
+    bool  bReturn = false;
     _asm
     {
         push    ModelID
@@ -126,15 +122,14 @@ BOOL CModelInfoSA::IsHeli()
         mov     bReturn, al
         add     esp, 4
     }
-    return (BOOL)bReturn;
+    return bReturn;
 }
 
-BOOL CModelInfoSA::IsPlane()
+bool CModelInfoSA::IsPlane()
 {
-    DEBUG_TRACE("BOOL CModelInfoSA::IsPlane ( )");
     DWORD dwFunction = FUNC_IsPlaneModel;
     DWORD ModelID = m_dwModelID;
-    BYTE  bReturn = 0;
+    bool  bReturn = false;
     _asm
     {
         push    ModelID
@@ -142,15 +137,14 @@ BOOL CModelInfoSA::IsPlane()
         mov     bReturn, al
         add     esp, 4
     }
-    return (BOOL)bReturn;
+    return bReturn;
 }
 
-BOOL CModelInfoSA::IsBike()
+bool CModelInfoSA::IsBike()
 {
-    DEBUG_TRACE("BOOL CModelInfoSA::IsBike ( )");
     DWORD dwFunction = FUNC_IsBikeModel;
     DWORD ModelID = m_dwModelID;
-    BYTE  bReturn = 0;
+    bool  bReturn = false;
     _asm
     {
         push    ModelID
@@ -158,15 +152,14 @@ BOOL CModelInfoSA::IsBike()
         mov     bReturn, al
         add     esp, 4
     }
-    return (BOOL)bReturn;
+    return bReturn;
 }
 
-BOOL CModelInfoSA::IsFakePlane()
+bool CModelInfoSA::IsFakePlane()
 {
-    DEBUG_TRACE("BOOL CModelInfoSA::IsFakePlane ( )");
     DWORD dwFunction = FUNC_IsFakePlaneModel;
     DWORD ModelID = m_dwModelID;
-    BYTE  bReturn = 0;
+    bool  bReturn = false;
     _asm
     {
         push    ModelID
@@ -174,15 +167,14 @@ BOOL CModelInfoSA::IsFakePlane()
         mov     bReturn, al
         add     esp, 4
     }
-    return (BOOL)bReturn;
+    return bReturn;
 }
 
-BOOL CModelInfoSA::IsMonsterTruck()
+bool CModelInfoSA::IsMonsterTruck()
 {
-    DEBUG_TRACE("BOOL CModelInfoSA::IsMonsterTruck ( )");
     DWORD dwFunction = FUNC_IsMonsterTruckModel;
     DWORD ModelID = m_dwModelID;
-    BYTE  bReturn = 0;
+    bool  bReturn = false;
     _asm
     {
         push    ModelID
@@ -190,15 +182,14 @@ BOOL CModelInfoSA::IsMonsterTruck()
         mov     bReturn, al
         add     esp, 4
     }
-    return (BOOL)bReturn;
+    return bReturn;
 }
 
-BOOL CModelInfoSA::IsQuadBike()
+bool CModelInfoSA::IsQuadBike()
 {
-    DEBUG_TRACE("BOOL CModelInfoSA::IsQuadBike ( )");
     DWORD dwFunction = FUNC_IsQuadBikeModel;
     DWORD ModelID = m_dwModelID;
-    BYTE  bReturn = 0;
+    bool  bReturn = false;
     _asm
     {
         push    ModelID
@@ -206,15 +197,14 @@ BOOL CModelInfoSA::IsQuadBike()
         mov     bReturn, al
         add     esp, 4
     }
-    return (BOOL)bReturn;
+    return bReturn;
 }
 
-BOOL CModelInfoSA::IsBmx()
+bool CModelInfoSA::IsBmx()
 {
-    DEBUG_TRACE("BOOL CModelInfoSA::IsBmx ( )");
     DWORD dwFunction = FUNC_IsBmxModel;
     DWORD ModelID = m_dwModelID;
-    BYTE  bReturn = 0;
+    bool  bReturn = false;
     _asm
     {
         push    ModelID
@@ -222,15 +212,14 @@ BOOL CModelInfoSA::IsBmx()
         mov     bReturn, al
         add     esp, 4
     }
-    return (BOOL)bReturn;
+    return bReturn;
 }
 
-BOOL CModelInfoSA::IsTrailer()
+bool CModelInfoSA::IsTrailer()
 {
-    DEBUG_TRACE("BOOL CModelInfoSA::IsTrailer ( )");
     DWORD dwFunction = FUNC_IsTrailerModel;
     DWORD ModelID = m_dwModelID;
-    BYTE  bReturn = 0;
+    bool  bReturn = false;
     _asm
     {
         push    ModelID
@@ -238,12 +227,11 @@ BOOL CModelInfoSA::IsTrailer()
         mov     bReturn, al
         add     esp, 4
     }
-    return (BOOL)bReturn;
+    return bReturn;
 }
 
 BYTE CModelInfoSA::GetVehicleType()
 {
-    DEBUG_TRACE("BOOL CModelInfoSA::IsVehicle ( )");
     // This function will return a vehicle type for vehicles or 0xFF on failure
     DWORD dwFunction = FUNC_IsVehicleModelType;
     DWORD ModelID = m_dwModelID;
@@ -274,16 +262,13 @@ bool CModelInfoSA::IsPlayerModel()
     return (GetInterface() && GetInterface()->pColModel && GetInterface()->pColModel == (CColModelSAInterface*)VAR_CTempColModels_ModelPed1);
 }
 
-BOOL CModelInfoSA::IsUpgrade()
+bool CModelInfoSA::IsUpgrade()
 {
     return m_dwModelID >= 1000 && m_dwModelID <= 1193;
 }
 
 char* CModelInfoSA::GetNameIfVehicle()
 {
-    DEBUG_TRACE("char * CModelInfoSA::GetNameIfVehicle ( )");
-    //  if(this->IsVehicle())
-    //  {
     DWORD dwModelInfo = (DWORD)ARRAY_ModelInfo;
     DWORD dwFunc = FUNC_CText_Get;
     DWORD ModelID = m_dwModelID;
@@ -312,8 +297,6 @@ char* CModelInfoSA::GetNameIfVehicle()
             pop     eax
         }
     return (char*)dwReturn;
-    //  }
-    //  return NULL;
 }
 
 uint CModelInfoSA::GetAnimFileIndex()
@@ -335,7 +318,6 @@ uint CModelInfoSA::GetAnimFileIndex()
 
 void CModelInfoSA::Request(EModelRequestType requestType, const char* szTag)
 {
-    DEBUG_TRACE("VOID CModelInfoSA::Request( BOOL bAndLoad, BOOL bWaitForLoad )");
     // don't bother loading it if it already is
     if (IsLoaded())
         return;
@@ -401,8 +383,6 @@ void CModelInfoSA::Request(EModelRequestType requestType, const char* szTag)
 
 void CModelInfoSA::Remove()
 {
-    DEBUG_TRACE("VOID CModelInfoSA::Remove ( )");
-
     // Don't remove if GTA refers to it somehow.
     // Or we'll screw up SA's map for example.
 
@@ -441,7 +421,7 @@ void CModelInfoSA::Remove()
     }
 }
 
-BOOL CModelInfoSA::IsLoaded()
+bool CModelInfoSA::IsLoaded()
 {
     if (DoIsLoaded())
     {
@@ -457,12 +437,10 @@ BOOL CModelInfoSA::IsLoaded()
     return false;
 }
 
-BOOL CModelInfoSA::DoIsLoaded()
+bool CModelInfoSA::DoIsLoaded()
 {
-    DEBUG_TRACE("BOOL CModelInfoSA::DoIsLoaded ( )");
-
     // return (BOOL)*(BYTE *)(ARRAY_ModelLoaded + 20*dwModelID);
-    BOOL bLoaded = pGame->GetStreaming()->HasModelLoaded(m_dwModelID);
+    bool bLoaded = pGame->GetStreaming()->HasModelLoaded(m_dwModelID);
 
     if (m_dwModelID < pGame->GetBaseIDforTXD())
     {
@@ -845,7 +823,7 @@ void CModelInfoSA::RemoveRef(bool bRemoveExtraGTARef)
     }
 }
 
-void CModelInfoSA::SetAlphaTransparencyEnabled(BOOL bEnabled)
+void CModelInfoSA::SetAlphaTransparencyEnabled(bool bEnabled)
 {
     m_pInterface = ppModelInfo[m_dwModelID];
     if (m_pInterface)
diff --git a/Client/game_sa/CModelInfoSA.h b/Client/game_sa/CModelInfoSA.h
index 490d81dc7e3..8519ec9c51a 100644
--- a/Client/game_sa/CModelInfoSA.h
+++ b/Client/game_sa/CModelInfoSA.h
@@ -322,27 +322,27 @@ class CModelInfoSA : public CModelInfo
 
     bool IsPlayerModel();
 
-    BOOL IsBoat();
-    BOOL IsCar();
-    BOOL IsTrain();
-    BOOL IsHeli();
-    BOOL IsPlane();
-    BOOL IsBike();
-    BOOL IsFakePlane();
-    BOOL IsMonsterTruck();
-    BOOL IsQuadBike();
-    BOOL IsBmx();
-    BOOL IsTrailer();
+    bool IsBoat();
+    bool IsCar();
+    bool IsTrain();
+    bool IsHeli();
+    bool IsPlane();
+    bool IsBike();
+    bool IsFakePlane();
+    bool IsMonsterTruck();
+    bool IsQuadBike();
+    bool IsBmx();
+    bool IsTrailer();
     bool IsVehicle() const override;
-    BOOL IsUpgrade();
+    bool IsUpgrade();
 
     char* GetNameIfVehicle();
 
     BYTE           GetVehicleType();
     void           Request(EModelRequestType requestType, const char* szTag);
     void           Remove();
-    BOOL           IsLoaded();
-    BOOL           DoIsLoaded();
+    bool           IsLoaded();
+    bool           DoIsLoaded();
     BYTE           GetFlags();
     CBoundingBox*  GetBoundingBox();
     bool           IsValid();
@@ -361,7 +361,7 @@ class CModelInfoSA : public CModelInfo
     bool           SetTime(char cHourOn, char cHourOff);
     static void    StaticResetModelTimes();
 
-    void        SetAlphaTransparencyEnabled(BOOL bEnabled);
+    void        SetAlphaTransparencyEnabled(bool bEnabled);
     bool        IsAlphaTransparencyEnabled();
     void        ResetAlphaTransparency();
     static void StaticResetAlphaTransparencies();
diff --git a/Client/game_sa/CMonsterTruckSA.cpp b/Client/game_sa/CMonsterTruckSA.cpp
index 00824a321de..2d47a0b2656 100644
--- a/Client/game_sa/CMonsterTruckSA.cpp
+++ b/Client/game_sa/CMonsterTruckSA.cpp
@@ -14,12 +14,10 @@
 
 CMonsterTruckSA::CMonsterTruckSA(CMonsterTruckSAInterface* monstertruck) : CAutomobileSA(monstertruck)
 {
-    DEBUG_TRACE("CMonsterTruckSA::CMonsterTruckSA( CMonsterTruckSAInterface * monstertruck )");
     this->m_pInterface = monstertruck;
 }
 
 CMonsterTruckSA::CMonsterTruckSA(eVehicleTypes dwModelID, unsigned char ucVariation, unsigned char ucVariation2)
     : CAutomobileSA(dwModelID, ucVariation, ucVariation2)
 {
-    DEBUG_TRACE("CMonsterTruckSA::CMonsterTruckSA( eVehicleTypes dwModelID ):CVehicleSA( dwModelID )");
 }
diff --git a/Client/game_sa/CObjectSA.cpp b/Client/game_sa/CObjectSA.cpp
index 6e2fccdd957..77f9b1787c7 100644
--- a/Client/game_sa/CObjectSA.cpp
+++ b/Client/game_sa/CObjectSA.cpp
@@ -68,13 +68,12 @@ struct CFileObjectInstance
 
 CObjectSA::CObjectSA(CObjectSAInterface* objectInterface)
 {
-    DEBUG_TRACE("CObjectSA::CObjectSA(CObjectSAInterface * objectInterface)");
     this->SetInterface(objectInterface);
     m_ucAlpha = 255;
 
     // Setup some flags
-    this->BeingDeleted = FALSE;
-    this->DoNotRemoveFromGame = FALSE;
+    this->BeingDeleted = false;
+    this->DoNotRemoveFromGame = false;
 
     if (m_pInterface)
     {
@@ -86,8 +85,6 @@ CObjectSA::CObjectSA(CObjectSAInterface* objectInterface)
 
 CObjectSA::CObjectSA(DWORD dwModel, bool bBreakingDisabled)
 {
-    DEBUG_TRACE("CObjectSA::CObjectSA( DWORD dwModel )");
-
     CWorldSA* world = (CWorldSA*)pGame->GetWorld();
 
     DWORD dwThis = 0;
@@ -187,8 +184,8 @@ CObjectSA::CObjectSA(DWORD dwModel, bool bBreakingDisabled)
         world->Add(m_pInterface, CObject_Constructor);
 
         // Setup some flags
-        this->BeingDeleted = FALSE;
-        this->DoNotRemoveFromGame = FALSE;
+        this->BeingDeleted = false;
+        this->DoNotRemoveFromGame = false;
         MemPutFast<BYTE>(dwObjectPtr + 316, 6);
         if (bBreakingDisabled)
         {
@@ -221,8 +218,6 @@ CObjectSA::CObjectSA(DWORD dwModel, bool bBreakingDisabled)
 
 CObjectSA::~CObjectSA()
 {
-    DEBUG_TRACE("CObjectSA::~CObjectSA( )");
-    // OutputDebugString("Attempting to destroy Object\n");
     if (!this->BeingDeleted && DoNotRemoveFromGame == false)
     {
         CEntitySAInterface* pInterface = GetInterface();
diff --git a/Client/game_sa/CPadSA.cpp b/Client/game_sa/CPadSA.cpp
index bd9b2c88438..3ac01ed77f1 100644
--- a/Client/game_sa/CPadSA.cpp
+++ b/Client/game_sa/CPadSA.cpp
@@ -14,39 +14,33 @@
 
 CControllerState* CPadSA::GetCurrentControllerState(CControllerState* ControllerState)
 {
-    DEBUG_TRACE("CControllerState * CPadSA::GetCurrentControllerState(CControllerState * ControllerState)");
     MemCpyFast(ControllerState, &this->internalInterface->NewState, sizeof(CControllerState));
     return ControllerState;
 }
 
 CControllerState* CPadSA::GetLastControllerState(CControllerState* ControllerState)
 {
-    DEBUG_TRACE("CControllerState * CPadSA::GetLastControllerState(CControllerState * ControllerState)");
     MemCpyFast(ControllerState, &this->internalInterface->OldState, sizeof(CControllerState));
     return ControllerState;
 }
 
 void CPadSA::SetCurrentControllerState(CControllerState* ControllerState)
 {
-    DEBUG_TRACE("VOID CPadSA::SetCurrentControllerState(CControllerState * ControllerState)");
     MemCpyFast(&this->internalInterface->NewState, ControllerState, sizeof(CControllerState));
 }
 
 void CPadSA::SetLastControllerState(CControllerState* ControllerState)
 {
-    DEBUG_TRACE("VOID CPadSA::SetLastControllerState(CControllerState * ControllerState)");
     MemCpyFast(&this->internalInterface->OldState, ControllerState, sizeof(CControllerState));
 }
 
 void CPadSA::Store()
 {
-    DEBUG_TRACE("VOID CPadSA::Store()");
     MemCpyFast(&this->StoredPad, this->internalInterface, sizeof(CPadSAInterface));
 }
 
 void CPadSA::Restore()
 {
-    DEBUG_TRACE("VOID CPadSA::Restore()");
     MemCpyFast(this->internalInterface, &this->StoredPad, sizeof(CPadSAInterface));
 }
 
diff --git a/Client/game_sa/CPadSA.h b/Client/game_sa/CPadSA.h
index 7d73a73bae9..8facdd4b08b 100644
--- a/Client/game_sa/CPadSA.h
+++ b/Client/game_sa/CPadSA.h
@@ -65,7 +65,6 @@ class CPadSA : public CPad
     CPadSAInterface  StoredPad;
 
 public:
-    // constructor
     CPadSA(CPadSAInterface* padInterface) { this->internalInterface = padInterface; };
 
     CControllerState* GetCurrentControllerState(CControllerState* ControllerState);
diff --git a/Client/game_sa/CPedIKSA.h b/Client/game_sa/CPedIKSA.h
index 95e5d92b495..72ab1596921 100644
--- a/Client/game_sa/CPedIKSA.h
+++ b/Client/game_sa/CPedIKSA.h
@@ -67,7 +67,6 @@ class CPedIKSA : public CPedIK
     CPedIKSAInterface* internalInterface;
 
 public:
-    // constructor
     CPedIKSA(CPedIKSAInterface* ikInterface) { internalInterface = ikInterface; };
 
     // r*'s functions
diff --git a/Client/game_sa/CPedIntelligenceSA.cpp b/Client/game_sa/CPedIntelligenceSA.cpp
index 32b26e4648f..1c41e41ddad 100644
--- a/Client/game_sa/CPedIntelligenceSA.cpp
+++ b/Client/game_sa/CPedIntelligenceSA.cpp
@@ -30,7 +30,6 @@ CPedIntelligenceSA::~CPedIntelligenceSA()
 
 CTaskManager* CPedIntelligenceSA::GetTaskManager()
 {
-    DEBUG_TRACE("CTaskManager * CPedSA::GetTaskManager( void )");
     return this->TaskManager;
 }
 
diff --git a/Client/game_sa/CPedSA.cpp b/Client/game_sa/CPedSA.cpp
index abead6e9d5a..075f56e2fd0 100644
--- a/Client/game_sa/CPedSA.cpp
+++ b/Client/game_sa/CPedSA.cpp
@@ -27,15 +27,11 @@ int             g_bOnlyUpdateRotations = false;
 
 CPedSA::CPedSA() : m_pPedIntelligence(NULL), m_pPedInterface(NULL), m_pPedSound(NULL), m_iCustomMoveAnim(0)
 {
-    DEBUG_TRACE("CPedSA::CPedSA(  )");
-
     MemSetFast(this->m_pWeapons, 0, sizeof(CWeaponSA*) * WEAPONSLOT_MAX);
 }
 
 CPedSA::CPedSA(CPedSAInterface* pPedInterface) : m_pPedIntelligence(NULL), m_pPedInterface(pPedInterface), m_pPedSound(NULL), m_iCustomMoveAnim(0)
 {
-    DEBUG_TRACE("CPedSA::CPedSA( CPedSAInterface * pedInterface )");
-
     MemSetFast(this->m_pWeapons, 0, sizeof(CWeaponSA*) * WEAPONSLOT_MAX);
 }
 
@@ -78,7 +74,6 @@ CPedSA::~CPedSA()
 
 void CPedSA::Init()
 {
-    DEBUG_TRACE("void CPedSA::Init()");
     CPedSAInterface* pedInterface = GetPedInterface();
 
     DWORD dwPedIntelligence = 0;
@@ -102,7 +97,6 @@ void CPedSA::Init()
 
 void CPedSA::SetModelIndex(DWORD dwModelIndex)
 {
-    DEBUG_TRACE("void CPedSA::SetModelIndex ( DWORD dwModelIndex )");
     DWORD dwFunction = FUNC_SetModelIndex;
     DWORD dwThis = (DWORD)this->GetInterface();
     _asm
@@ -133,7 +127,6 @@ void CPedSA::RemoveGeometryRef()
 
 bool CPedSA::IsInWater()
 {
-    DEBUG_TRACE("bool CPedSA::IsInWater ()");
     CTask* pTask = this->m_pPedIntelligence->GetTaskManager()->GetTask(TASK_PRIORITY_EVENT_RESPONSE_NONTEMP);
     return (pTask && (pTask->GetTaskType() == TASK_COMPLEX_IN_WATER));
 }
@@ -164,7 +157,6 @@ void CPedSA::AttachPedToEntity(DWORD dwEntityInterface, CVector* vector, unsigne
                                bool bChangeCamera)
 {
     // sDirection and fRotationLimit only apply to first-person shooting (bChangeCamera)
-    DEBUG_TRACE("void CPedSA::AttachPedToEntity(CVehicle * entity, CVector * vector, unsigned short sUnk, FLOAT fUnk, eWeaponType weaponType)");
     DWORD dwFunc = FUNC_AttachPedToEntity;
     DWORD dwThis = (DWORD)this->GetInterface();
     float fX = vector->fX;
@@ -196,7 +188,6 @@ void CPedSA::AttachPedToEntity(DWORD dwEntityInterface, CVector* vector, unsigne
 
 CVehicle* CPedSA::GetVehicle()
 {
-    DEBUG_TRACE("CVehicle * CPedSA::GetVehicle()");
     if (((CPedSAInterface*)this->GetInterface())->pedFlags.bInVehicle)
     {
         CVehicleSAInterface* vehicle = (CVehicleSAInterface*)(((CPedSAInterface*)this->GetInterface())->CurrentObjective);
@@ -219,7 +210,6 @@ void CPedSA::Respawn(CVector* position, bool bCameraCut)
         MemSet((void*)0x4422EA, 0x90, 20);
     }
 
-    DEBUG_TRACE("void CPedSA::Respawn(CVector * position)");
     float fX = position->fX;
     float fY = position->fY;
     float fZ = position->fZ;
diff --git a/Client/game_sa/CPhysicalSA.cpp b/Client/game_sa/CPhysicalSA.cpp
index af6622ec35f..51de6dd2a50 100644
--- a/Client/game_sa/CPhysicalSA.cpp
+++ b/Client/game_sa/CPhysicalSA.cpp
@@ -69,7 +69,6 @@ CVector* CPhysicalSA::GetTurnSpeed(CVector* vecTurnSpeed)
 
 CVector* CPhysicalSA::GetMoveSpeedInternal(CVector* vecMoveSpeed)
 {
-    DEBUG_TRACE("CVector * CPhysicalSA::GetMoveSpeed(CVector * vecMoveSpeed)");
     DWORD dwFunc = FUNC_GetMoveSpeed;
     DWORD dwThis = (DWORD)((CPhysicalSAInterface*)this->GetInterface());
     DWORD dwReturn = 0;
@@ -85,7 +84,6 @@ CVector* CPhysicalSA::GetMoveSpeedInternal(CVector* vecMoveSpeed)
 
 CVector* CPhysicalSA::GetTurnSpeedInternal(CVector* vecTurnSpeed)
 {
-    DEBUG_TRACE("CVector * CPhysicalSA::GetTurnSpeed(CVector * vecTurnSpeed)");
     DWORD dwFunc = FUNC_GetTurnSpeed;
     DWORD dwThis = (DWORD)((CPhysicalSAInterface*)this->GetInterface());
     DWORD dwReturn = 0;
@@ -101,7 +99,6 @@ CVector* CPhysicalSA::GetTurnSpeedInternal(CVector* vecTurnSpeed)
 
 void CPhysicalSA::SetMoveSpeed(CVector* vecMoveSpeed)
 {
-    DEBUG_TRACE("VOID CPhysicalSA::SetMoveSpeed(CVector * vecMoveSpeed)");
     DWORD dwFunc = FUNC_GetMoveSpeed;
     DWORD dwThis = (DWORD)((CPhysicalSAInterface*)this->GetInterface());
     DWORD dwReturn = 0;
@@ -123,8 +120,6 @@ void CPhysicalSA::SetMoveSpeed(CVector* vecMoveSpeed)
 
 void CPhysicalSA::SetTurnSpeed(CVector* vecTurnSpeed)
 {
-    DEBUG_TRACE("VOID CPhysicalSA::SetTurnSpeed(CVector * vecTurnSpeed)");
-
     ((CPhysicalSAInterface*)this->GetInterface())->m_vecAngularVelocity = *vecTurnSpeed;
 
     if (GetInterface()->nType == ENTITY_TYPE_OBJECT)
@@ -196,7 +191,6 @@ void CPhysicalSA::SetCenterOfMass(CVector& vecCenterOfMass)
 
 void CPhysicalSA::ProcessCollision()
 {
-    DEBUG_TRACE("VOID CPhysicalSA::ProcessCollision()");
     DWORD dwFunc = FUNC_ProcessCollision;
     DWORD dwThis = (DWORD)this->GetInterface();
 
@@ -266,24 +260,14 @@ CEntity* CPhysicalSA::GetAttachedEntity()
 
 void CPhysicalSA::AttachEntityToEntity(CPhysical& Entity, const CVector& vecPosition, const CVector& vecRotation)
 {
-    DEBUG_TRACE("void CPhysicalSA::AttachEntityToEntity(CPhysical& Entity, const CVector& vecPosition, const CVector& vecRotation)");
-
-    try
-    {
-        CPhysicalSA& EntitySA = dynamic_cast<CPhysicalSA&>(Entity);
-        DWORD        dwEntityInterface = (DWORD)EntitySA.GetInterface();
+    CPhysicalSA& EntitySA = dynamic_cast<CPhysicalSA&>(Entity);
+	DWORD        dwEntityInterface = (DWORD)EntitySA.GetInterface();
 
-        InternalAttachEntityToEntity(dwEntityInterface, &vecPosition, &vecRotation);
-    }
-    catch (...)
-    {
-        DEBUG_TRACE("Invalid Entity argument detected");
-    }
+	InternalAttachEntityToEntity(dwEntityInterface, &vecPosition, &vecRotation);
 }
 
 void CPhysicalSA::DetachEntityFromEntity(float fUnkX, float fUnkY, float fUnkZ, bool bUnk)
 {
-    DEBUG_TRACE("void CPhysicalSA::DetachEntityFromEntity(float fUnkX, float fUnkY, float fUnk, bool bUnk)");
     DWORD dwFunc = FUNC_DetatchEntityFromEntity;
     DWORD dwThis = (DWORD)this->GetInterface();
 
@@ -305,7 +289,6 @@ void CPhysicalSA::DetachEntityFromEntity(float fUnkX, float fUnkY, float fUnkZ,
 
 bool CPhysicalSA::InternalAttachEntityToEntity(DWORD dwEntityInterface, const CVector* vecPosition, const CVector* vecRotation)
 {
-    DEBUG_TRACE("bool CPhysicalSA::AttachEntityToEntity(CPhysical * entityToAttach, CVector * vecPosition, CVector * vecRotation)");
     DWORD dwFunc = FUNC_AttachEntityToEntity;
     DWORD dwThis = (DWORD)this->GetInterface();
     DWORD dwReturn = 0;
diff --git a/Client/game_sa/CPickupSA.cpp b/Client/game_sa/CPickupSA.cpp
index bb786b06aeb..78d901cdaae 100644
--- a/Client/game_sa/CPickupSA.cpp
+++ b/Client/game_sa/CPickupSA.cpp
@@ -15,15 +15,12 @@
 
 CPickupSA::CPickupSA(CPickupSAInterface* pickupInterface)
 {
-    DEBUG_TRACE("CPickupSA::CPickupSA(CPickupSAInterface * pickupInterface)");
     this->internalInterface = pickupInterface;
-    this->callback = 0;
     this->object = 0;
 }
 
 void CPickupSA::SetPosition(CVector* vecPosition)
 {
-    DEBUG_TRACE("VOID CPickupSA::SetPosition(CVector * vecPosition)");
     this->GetInterface()->bIsPickupNearby = 0;
 
     CPickupSAInterface* iPickup = this->GetInterface();
@@ -34,7 +31,6 @@ void CPickupSA::SetPosition(CVector* vecPosition)
 
 CVector* CPickupSA::GetPosition(CVector* vecPosition)
 {
-    DEBUG_TRACE("CVector * CPickupSA::GetPosition(CVector * vecPosition)");
     CPickupSAInterface* iPickup = this->GetInterface();
     vecPosition->fX = iPickup->CoorsX / 8.0f;
     vecPosition->fY = iPickup->CoorsY / 8.0f;
@@ -44,103 +40,86 @@ CVector* CPickupSA::GetPosition(CVector* vecPosition)
 
 ePickupType CPickupSA::GetType()
 {
-    DEBUG_TRACE("ePickupType CPickupSA::GetType()");
     return (ePickupType)this->GetInterface()->Type;
 }
 
 void CPickupSA::SetType(ePickupType type)
 {
-    DEBUG_TRACE("VOID CPickupSA::SetType(ePickupType type)");
     this->GetInterface()->Type = type;
 }
 
 float CPickupSA::GetCurrentValue()
 {
-    DEBUG_TRACE("FLOAT CPickupSA::GetCurrentValue()");
     return this->GetInterface()->CurrentValue;
 }
 
 void CPickupSA::SetCurrentValue(float fCurrentValue)
 {
-    DEBUG_TRACE("VOID CPickupSA::SetCurrentValue(FLOAT fCurrentValue)");
     this->GetInterface()->CurrentValue = fCurrentValue;
 }
 
 void CPickupSA::SetRegenerationTime(DWORD dwTime)
 {
-    DEBUG_TRACE("VOID CPickupSA::SetRegenerationTime(DWORD dwTime)");
     this->GetInterface()->RegenerationTime = dwTime;
 }
 
 void CPickupSA::SetMoneyPerDay(WORD wMoneyPerDay)
 {
-    DEBUG_TRACE("VOID CPickupSA::SetMoneyPerDay(WORD wMoneyPerDay)");
     this->GetInterface()->MoneyPerDay = wMoneyPerDay;
 }
 
 WORD CPickupSA::GetMoneyPerDay()
 {
-    DEBUG_TRACE("WORD CPickupSA::GetMoneyPerDay()");
     return this->GetInterface()->MoneyPerDay;
 }
 
 WORD CPickupSA::GetModel()
 {
-    DEBUG_TRACE("WORD CPickupSA::GetModel()");
     return this->GetInterface()->MI;
 }
 
 void CPickupSA::SetModel(WORD wModelIndex)
 {
-    DEBUG_TRACE("VOID CPickupSA::SetModel(WORD wModelIndex)");
     this->GetInterface()->MI = wModelIndex;
 }
 
 ePickupState CPickupSA::GetState()
 {
-    DEBUG_TRACE("ePickupState CPickupSA::GetState()");
     return (ePickupState)this->GetInterface()->State;
 }
 
 void CPickupSA::SetState(ePickupState bState)
 {
-    DEBUG_TRACE("VOID CPickupSA::SetState(ePickupState bState)");
     this->GetInterface()->State = (BYTE)bState;
 }
 
 BYTE CPickupSA::GetAmmo()
 {
-    DEBUG_TRACE("BYTE CPickupSA::GetAmmo()");
     return this->GetInterface()->bNoAmmo;
 }
 
 void CPickupSA::SetAmmo(BYTE bAmmo)
 {
-    DEBUG_TRACE("VOID CPickupSA::SetAmmo(BYTE bAmmo)");
     this->GetInterface()->bNoAmmo = bAmmo;
 }
 
 long CPickupSA::GetMonetaryValue()
 {
-    DEBUG_TRACE("long CPickupSA::GetMonetaryValue()");
     return this->GetInterface()->MonetaryValue;
 }
 
 void CPickupSA::SetMonetaryValue(long lMonetaryValue)
 {
-    DEBUG_TRACE("VOID CPickupSA::SetMonetaryValue(long lMonetaryValue)");
     this->GetInterface()->MonetaryValue = lMonetaryValue;
 }
 
 BYTE CPickupSA::IsNearby()
 {
-    DEBUG_TRACE("BYTE CPickupSA::IsNearby()");
     return this->GetInterface()->bIsPickupNearby;
 }
 
 void CPickupSA::GiveUsAPickUpObject(int ForcedObjectIndex)
 {
-    DEBUG_TRACE("VOID CPickupSA::GiveUsAPickUpObject(int ForcedObjectIndex)");
     DWORD GiveUsAPickUpObject = FUNC_GIVEUSAPICKUP;
     DWORD dwObject = (DWORD) & (this->GetInterface()->pObject);
     DWORD dwThis = (DWORD)this->GetInterface();
@@ -165,7 +144,6 @@ void CPickupSA::GiveUsAPickUpObject(int ForcedObjectIndex)
 
 void CPickupSA::GetRidOfObjects()
 {
-    DEBUG_TRACE("VOID CPickupSA::GetRidOfObjects()");
     if (this->GetInterface()->pObject)
         ((CWorldSA*)pGame->GetWorld())->Remove(this->GetInterface()->pObject, CPickup_Destructor);
 
diff --git a/Client/game_sa/CPickupSA.h b/Client/game_sa/CPickupSA.h
index 223a55fe2a0..af958d1f892 100644
--- a/Client/game_sa/CPickupSA.h
+++ b/Client/game_sa/CPickupSA.h
@@ -44,9 +44,7 @@ class CPickupSA : public CPickup
 private:
     CPickupSAInterface* internalInterface;
     CObjectSA*          object;
-    CBPickup            callback;            // function to call when the pickup is picked up [not used yet/ever]
 public:
-    // constructor
     CPickupSA(CPickupSAInterface* pickupInterface);
     CPickupSAInterface* GetInterface() { return internalInterface; };            // not to be exported
     CObject*            GetObject() { return object; };
diff --git a/Client/game_sa/CPickupsSA.cpp b/Client/game_sa/CPickupsSA.cpp
index cf02c781c91..b9ccdb74ec9 100644
--- a/Client/game_sa/CPickupsSA.cpp
+++ b/Client/game_sa/CPickupsSA.cpp
@@ -16,7 +16,6 @@
 
 CPickupsSA::CPickupsSA()
 {
-    DEBUG_TRACE("CPickupsSA::CPickupsSA()");
     for (int i = 0; i < MAX_PICKUPS; i++)
         Pickups[i] = new CPickupSA((CPickupSAInterface*)(ARRAY_PICKUPS + i * sizeof(CPickupSAInterface)));
 }
@@ -31,15 +30,11 @@ CPickupsSA::~CPickupsSA()
 
 CPickup* CPickupsSA::GetPickup(DWORD ID)
 {
-    DEBUG_TRACE("CPickup * CPickupsSA::GetPickup(DWORD ID)");
     return (CPickup*)Pickups[ID];
 }
 
 CPickup* CPickupsSA::CreatePickup(CVector* position, DWORD ModelIndex, ePickupType Type, DWORD dwMonetaryValue, DWORD dwMoneyPerDay, BYTE bPingOutOfPlayer)
 {
-    DEBUG_TRACE(
-        "CPickup * CPickupsSA::CreatePickup(CVector * position, DWORD ModelIndex, ePickupType Type, DWORD dwMonetaryValue, DWORD dwMoneyPerDay, BYTE "
-        "bPingOutOfPlayer)");
     DWORD      FreeSlot = 0;
     bool       bFoundFreeSlot = false;
     CPickupSA* pickup;
diff --git a/Client/game_sa/CPlaneSA.cpp b/Client/game_sa/CPlaneSA.cpp
index 24a5d744a5f..816f0689d4e 100644
--- a/Client/game_sa/CPlaneSA.cpp
+++ b/Client/game_sa/CPlaneSA.cpp
@@ -14,11 +14,9 @@
 
 CPlaneSA::CPlaneSA(CPlaneSAInterface* plane) : CAutomobileSA(plane)
 {
-    DEBUG_TRACE("CPlaneSA::CPlaneSA( CPlaneSAInterface * plane )");
     this->m_pInterface = plane;
 }
 
 CPlaneSA::CPlaneSA(eVehicleTypes dwModelID, unsigned char ucVariation, unsigned char ucVariation2) : CAutomobileSA(dwModelID, ucVariation, ucVariation2)
 {
-    DEBUG_TRACE("CPlaneSA::CPlaneSA( eVehicleTypes dwModelID ):CVehicleSA( dwModelID )");
 }
diff --git a/Client/game_sa/CPlayerInfoSA.cpp b/Client/game_sa/CPlayerInfoSA.cpp
index cac0ef03314..25cc51da570 100644
--- a/Client/game_sa/CPlayerInfoSA.cpp
+++ b/Client/game_sa/CPlayerInfoSA.cpp
@@ -14,8 +14,6 @@
 
 CWanted* CPlayerInfoSA::GetWanted()
 {
-    DEBUG_TRACE("CWanted * CPlayerInfoSA::GetWanted ( )");
-
     if (!wanted)
         wanted = new CWantedSA(this->internalInterface->PlayerPedData.m_Wanted);
 
@@ -28,7 +26,6 @@ CWanted* CPlayerInfoSA::GetWanted()
  */
 long CPlayerInfoSA::GetPlayerMoney()
 {
-    DEBUG_TRACE("unsigned long CPlayerInfoSA::GetPlayerMoney ( void )");
     // return internalInterface->DisplayScore;
     return *(long*)(0xB7CE50);
 }
@@ -39,7 +36,6 @@ long CPlayerInfoSA::GetPlayerMoney()
  */
 void CPlayerInfoSA::SetPlayerMoney(long lMoney, bool bInstant)
 {
-    DEBUG_TRACE("void CPlayerInfoSA::SetPlayerMoney ( unsigned long ulMoney, bool bInstant )");
     MemPutFast<long>(0xB7CE50, lMoney);
 
     if (bInstant)
diff --git a/Client/game_sa/CPlayerPedSA.cpp b/Client/game_sa/CPlayerPedSA.cpp
index 706b52982e2..8cb051e66cb 100644
--- a/Client/game_sa/CPlayerPedSA.cpp
+++ b/Client/game_sa/CPlayerPedSA.cpp
@@ -24,7 +24,6 @@ static std::set<SString>   ms_DoneAnimBlockRefMap;
 
 CPlayerPedSA::CPlayerPedSA(ePedModel pedType)
 {
-    DEBUG_TRACE("CPlayerPedSA::CPlayerPedSA( ePedModel pedType )");
     // based on CPlayerPed::SetupPlayerPed (R*)
     DWORD CPedOperatorNew = FUNC_CPedOperatorNew;
     DWORD CPlayerPedConstructor = FUNC_CPlayerPedConstructor;
@@ -51,8 +50,8 @@ CPlayerPedSA::CPlayerPedSA(ePedModel pedType)
     CWorldSA* world = (CWorldSA*)pGame->GetWorld();
 
     this->SetModelIndex(pedType);
-    this->BeingDeleted = FALSE;
-    this->DoNotRemoveFromGame = FALSE;
+    this->BeingDeleted = false;
+    this->DoNotRemoveFromGame = false;
     this->SetType(PLAYER_PED);
 
     // Allocate a player data struct and set it as the players
@@ -95,14 +94,13 @@ CPlayerPedSA::CPlayerPedSA(ePedModel pedType)
 
 CPlayerPedSA::CPlayerPedSA(CPlayerPedSAInterface* pPlayer)
 {
-    DEBUG_TRACE("CPlayerPedSA::CPlayerPedSA( CPedSAInterface * ped )");
     // based on CPlayerPed::SetupPlayerPed (R*)
     this->SetInterface((CEntitySAInterface*)pPlayer);
 
     this->Init();
     CPoolsSA* pools = (CPoolsSA*)pGame->GetPools();
     this->SetType(PLAYER_PED);
-    this->BeingDeleted = FALSE;
+    this->BeingDeleted = false;
 
     m_bIsLocal = true;
     DoNotRemoveFromGame = true;
@@ -126,7 +124,6 @@ CPlayerPedSA::CPlayerPedSA(CPlayerPedSAInterface* pPlayer)
 
 CPlayerPedSA::~CPlayerPedSA()
 {
-    DEBUG_TRACE("CPlayerPedSA::~CPlayerPedSA( )");
     if (!this->BeingDeleted && DoNotRemoveFromGame == false)
     {
         DWORD dwInterface = (DWORD)m_pInterface;
diff --git a/Client/game_sa/CPoolsSA.cpp b/Client/game_sa/CPoolsSA.cpp
index 72b3f29d1c6..106a400ced6 100644
--- a/Client/game_sa/CPoolsSA.cpp
+++ b/Client/game_sa/CPoolsSA.cpp
@@ -20,7 +20,6 @@ extern bool g_bVehiclePointerInvalid;
 
 CPoolsSA::CPoolsSA()
 {
-    DEBUG_TRACE("CPoolsSA::CPoolsSA()");
     m_ppPedPoolInterface = (CPoolSAInterface<CPedSAInterface>**)0xB74490;
     m_ppObjectPoolInterface = (CPoolSAInterface<CObjectSAInterface>**)0xB7449C;
     m_ppVehiclePoolInterface = (CPoolSAInterface<CVehicleSAInterface>**)0xB74494;
@@ -58,8 +57,6 @@ void CPoolsSA::DeleteAllBuildings()
 //////////////////////////////////////////////////////////////////////////////////////////
 inline bool CPoolsSA::AddVehicleToPool(CClientVehicle* pClientVehicle, CVehicleSA* pVehicle)
 {
-    DEBUG_TRACE("inline bool CPoolsSA::AddVehicleToPool ( CClientVehicle* pClientVehicle, CVehicleSA* pVehicle )");
-
     // Grab the interface
     CVehicleSAInterface* pInterface = pVehicle->GetVehicleInterface();
 
@@ -84,7 +81,6 @@ inline bool CPoolsSA::AddVehicleToPool(CClientVehicle* pClientVehicle, CVehicleS
 
 CVehicle* CPoolsSA::AddVehicle(CClientVehicle* pClientVehicle, eVehicleTypes eVehicleType, unsigned char ucVariation, unsigned char ucVariation2)
 {
-    DEBUG_TRACE("CVehicle* CPoolsSA::AddVehicle ( CClientVehicle* pClientVehicle, eVehicleTypes eVehicleType )");
     CVehicleSA* pVehicle = NULL;
 
     if (m_vehiclePool.ulCount < MAX_VEHICLES)
@@ -117,7 +113,6 @@ CVehicle* CPoolsSA::AddVehicle(CClientVehicle* pClientVehicle, eVehicleTypes eVe
 
 CVehicle* CPoolsSA::AddVehicle(CClientVehicle* pClientVehicle, DWORD* pGameInterface)
 {
-    DEBUG_TRACE("CVehicle* CPoolsSA::AddVehicle ( CClientVehicle* pClientVehicle, DWORD* pGameInterface )");
     CVehicleSA* pVehicle = NULL;
 
     if (m_vehiclePool.ulCount < MAX_VEHICLES)
@@ -167,8 +162,6 @@ CVehicle* CPoolsSA::AddVehicle(CClientVehicle* pClientVehicle, DWORD* pGameInter
 
 void CPoolsSA::RemoveVehicle(CVehicle* pVehicle, bool bDelete)
 {
-    DEBUG_TRACE("void CPoolsSA::RemoveVehicle ( CVehicle * pVehicle, bool bDelete )");
-
     static bool bIsDeletingVehicleAlready = false;
 
     if (!bIsDeletingVehicleAlready)
@@ -200,8 +193,6 @@ void CPoolsSA::RemoveVehicle(CVehicle* pVehicle, bool bDelete)
 
 SClientEntity<CVehicleSA>* CPoolsSA::GetVehicle(DWORD* pGameInterface)
 {
-    DEBUG_TRACE("SClientEntity<CVehicleSA>* CPoolsSA::GetVehicle ( DWORD* pGameInterface )");
-
     if (m_bGetVehicleEnabled)
     {
         CVehicleSAInterface* pInterface = reinterpret_cast<CVehicleSAInterface*>(pGameInterface);
@@ -221,8 +212,6 @@ SClientEntity<CVehicleSA>* CPoolsSA::GetVehicle(DWORD* pGameInterface)
 
 DWORD CPoolsSA::GetVehicleRef(CVehicle* pVehicle)
 {
-    DEBUG_TRACE("DWORD CPoolsSA::GetVehicleRef ( CVehicle* pVehicle )");
-
     DWORD       dwRef = 0;
     CVehicleSA* pVehicleSA = dynamic_cast<CVehicleSA*>(pVehicle);
     if (pVehicleSA)
@@ -243,8 +232,6 @@ DWORD CPoolsSA::GetVehicleRef(CVehicle* pVehicle)
 
 DWORD CPoolsSA::GetVehicleRef(DWORD* pGameInterface)
 {
-    DEBUG_TRACE("DWORD CPoolsSA::GetVehicleRef ( DWORD* pGameInterface )");
-
     DWORD                dwRef = 0;
     CVehicleSAInterface* pInterface = reinterpret_cast<CVehicleSAInterface*>(pGameInterface);
     if (pInterface)
@@ -264,8 +251,6 @@ DWORD CPoolsSA::GetVehicleRef(DWORD* pGameInterface)
 
 CVehicle* CPoolsSA::GetVehicleFromRef(DWORD dwGameRef)
 {
-    DEBUG_TRACE("CVehicle* CPoolsSA::GetVehicleFromRef ( DWORD dwGameRef )");
-
     DWORD dwReturn;
     DWORD dwFunction = FUNC_GetVehicle;
 
@@ -294,8 +279,6 @@ CVehicle* CPoolsSA::GetVehicleFromRef(DWORD dwGameRef)
 
 void CPoolsSA::DeleteAllVehicles()
 {
-    DEBUG_TRACE("void CPoolsSA::DeleteAllVehicles ( )");
-
     while (m_vehiclePool.ulCount > 0)
     {
         CVehicleSA* pVehicle = m_vehiclePool.arrayOfClientEntities[m_vehiclePool.ulCount - 1].pEntity;
@@ -309,8 +292,6 @@ void CPoolsSA::DeleteAllVehicles()
 //////////////////////////////////////////////////////////////////////////////////////////
 inline bool CPoolsSA::AddObjectToPool(CClientObject* pClientObject, CObjectSA* pObject)
 {
-    DEBUG_TRACE("inline bool CPoolsSA::AddObjectToPool ( CClientObject* pClientObject, CObjectSA* pObject )");
-
     // Grab the new object interface
     CObjectSAInterface* pInterface = pObject->GetObjectInterface();
 
@@ -337,8 +318,6 @@ inline bool CPoolsSA::AddObjectToPool(CClientObject* pClientObject, CObjectSA* p
 
 CObject* CPoolsSA::AddObject(CClientObject* pClientObject, DWORD dwModelID, bool bLowLod, bool bBreakingDisabled)
 {
-    DEBUG_TRACE("CObject * CPoolsSA::AddObject ( CClientObject* pClientObject, DWORD dwModelID, bool bLowLod, bool bBreakingDisabled )");
-
     CObjectSA* pObject = NULL;
 
     if (m_objectPool.ulCount < MAX_OBJECTS)
@@ -369,8 +348,6 @@ CObject* CPoolsSA::AddObject(CClientObject* pClientObject, DWORD dwModelID, bool
 
 void CPoolsSA::RemoveObject(CObject* pObject, bool bDelete)
 {
-    DEBUG_TRACE("void CPoolsSA::RemoveObject ( CObject* pObject, bool bDelete )");
-
     static bool bIsDeletingObjectAlready = false;
 
     if (!bIsDeletingObjectAlready)
@@ -402,8 +379,6 @@ void CPoolsSA::RemoveObject(CObject* pObject, bool bDelete)
 
 SClientEntity<CObjectSA>* CPoolsSA::GetObject(DWORD* pGameInterface)
 {
-    DEBUG_TRACE("CObject* CPoolsSA::GetObject( DWORD* pGameInterface )");
-
     CObjectSAInterface* pInterface = reinterpret_cast<CObjectSAInterface*>(pGameInterface);
 
     if (pInterface)
@@ -420,8 +395,6 @@ SClientEntity<CObjectSA>* CPoolsSA::GetObject(DWORD* pGameInterface)
 
 DWORD CPoolsSA::GetObjectRef(CObject* pObject)
 {
-    DEBUG_TRACE("DWORD CPoolsSA::GetObjectRef ( CObject* pObject )");
-
     DWORD      dwRef = 0;
     CObjectSA* pObjectSA = dynamic_cast<CObjectSA*>(pObject);
     if (pObjectSA)
@@ -442,8 +415,6 @@ DWORD CPoolsSA::GetObjectRef(CObject* pObject)
 
 DWORD CPoolsSA::GetObjectRef(DWORD* pGameInterface)
 {
-    DEBUG_TRACE("DWORD CPoolsSA::GetObjectRef ( DWORD* pGameInterface )");
-
     DWORD               dwRef = 0;
     CObjectSAInterface* pInterface = reinterpret_cast<CObjectSAInterface*>(pGameInterface);
     if (pInterface)
@@ -463,8 +434,6 @@ DWORD CPoolsSA::GetObjectRef(DWORD* pGameInterface)
 
 CObject* CPoolsSA::GetObjectFromRef(DWORD dwGameRef)
 {
-    DEBUG_TRACE("CObject* CPoolsSA::GetObjectFromRef ( DWORD dwGameRef )");
-
     DWORD dwReturn;
     DWORD dwFunction = FUNC_GetObject;
 
@@ -511,8 +480,6 @@ CObject* CPoolsSA::GetObjectFromIndex(std::uint32_t elementIndexInPool)
 
 void CPoolsSA::DeleteAllObjects()
 {
-    DEBUG_TRACE("void CPoolsSA::DeleteAllObjects ( )");
-
     while (m_objectPool.ulCount > 0)
     {
         CObjectSA* pObject = m_objectPool.arrayOfClientEntities[m_objectPool.ulCount - 1].pEntity;
@@ -526,8 +493,6 @@ void CPoolsSA::DeleteAllObjects()
 //////////////////////////////////////////////////////////////////////////////////////////
 inline bool CPoolsSA::AddPedToPool(CClientPed* pClientPed, CPedSA* pPed)
 {
-    DEBUG_TRACE("inline bool CPoolsSA::AddPedToPool ( CClientPed* pClientPed, CPedSA* pPed )");
-
     // Grab the ped interface
     CPedSAInterface* pInterface = pPed->GetPedInterface();
 
@@ -552,8 +517,6 @@ inline bool CPoolsSA::AddPedToPool(CClientPed* pClientPed, CPedSA* pPed)
 
 CPed* CPoolsSA::AddPed(CClientPed* pClientPed, ePedModel ePedType)
 {
-    DEBUG_TRACE("CPed* CPoolsSA::AddPed ( CClientPed* pClientPed, ePedModel ePedType )");
-
     CPedSA* pPed = NULL;
     if (m_pedPool.ulCount < MAX_PEDS)
     {
@@ -569,8 +532,6 @@ CPed* CPoolsSA::AddPed(CClientPed* pClientPed, ePedModel ePedType)
 
 CPed* CPoolsSA::AddPed(CClientPed* pClientPed, DWORD* pGameInterface)
 {
-    DEBUG_TRACE("CPed* CPoolsSA::AddPed ( CClientPed* pClientPed, DWORD* pGameInterface )");
-
     CPedSA* pPed = NULL;
 
     if (m_pedPool.ulCount < MAX_PEDS)
@@ -607,8 +568,6 @@ CPed* CPoolsSA::AddPed(CClientPed* pClientPed, DWORD* pGameInterface)
 
 void CPoolsSA::RemovePed(CPed* pPed, bool bDelete)
 {
-    DEBUG_TRACE("void CPoolsSA::RemovePed( CPed* pPed, bool bDelete )");
-
     static bool bIsDeletingPedAlready = false;            // to prevent delete being called twice
 
     if (!bIsDeletingPedAlready)
@@ -655,8 +614,6 @@ void CPoolsSA::RemovePed(CPed* pPed, bool bDelete)
 
 SClientEntity<CPedSA>* CPoolsSA::GetPed(DWORD* pGameInterface)
 {
-    DEBUG_TRACE("SClientEntity<T>* CPoolsSA::GetPed ( DWORD* pGameInterface )");
-
     CPedSAInterface* pInterface = reinterpret_cast<CPedSAInterface*>(pGameInterface);
 
     // 0x00400000 is used for bad player pointers some places in GTA
@@ -675,8 +632,6 @@ SClientEntity<CPedSA>* CPoolsSA::GetPed(DWORD* pGameInterface)
 
 DWORD CPoolsSA::GetPedRef(CPed* pPed)
 {
-    DEBUG_TRACE("DWORD CPoolsSA::GetPedRef ( CPed* pPed )");
-
     DWORD   dwRef = 0;
     CPedSA* pPedSA = dynamic_cast<CPedSA*>(pPed);
     if (pPedSA)
@@ -697,8 +652,6 @@ DWORD CPoolsSA::GetPedRef(CPed* pPed)
 
 DWORD CPoolsSA::GetPedRef(DWORD* pGameInterface)
 {
-    DEBUG_TRACE("DWORD CPoolsSA::GetPedRef ( DWORD* pGameInterface )");
-
     DWORD            dwRef = 0;
     CPedSAInterface* pInterface = reinterpret_cast<CPedSAInterface*>(pGameInterface);
     if (pInterface)
@@ -717,8 +670,6 @@ DWORD CPoolsSA::GetPedRef(DWORD* pGameInterface)
 
 CPed* CPoolsSA::GetPedFromRef(DWORD dwGameRef)
 {
-    DEBUG_TRACE("CPed* CPoolsSA::GetPedFromRef ( DWORD dwGameRef )");
-
     CPedSAInterface* pInterface = this->GetPedInterface(dwGameRef);
     if (pInterface)
     {
@@ -735,8 +686,6 @@ CPed* CPoolsSA::GetPedFromRef(DWORD dwGameRef)
 
 CPedSAInterface* CPoolsSA::GetPedInterface(DWORD dwGameRef)
 {
-    DEBUG_TRACE("CPedSAInterface* CPoolsSA::GetPedInterface ( DWORD dwGameRef )");
-
     DWORD dwReturn;
     DWORD dwFunction = FUNC_GetPed;
 
@@ -754,8 +703,6 @@ CPedSAInterface* CPoolsSA::GetPedInterface(DWORD dwGameRef)
 
 void CPoolsSA::DeleteAllPeds()
 {
-    DEBUG_TRACE("void CPoolsSA::DeleteAllPeds ( )");
-
     while (m_pedPool.ulCount > 0)
     {
         CPedSA* pPed = m_pedPool.arrayOfClientEntities[m_pedPool.ulCount - 1].pEntity;
@@ -815,8 +762,6 @@ CClientEntity* CPoolsSA::GetClientEntity(DWORD* pGameInterface)
 
 CBuilding* CPoolsSA::AddBuilding(DWORD dwModelID)
 {
-    DEBUG_TRACE("CBuilding * CPoolsSA::AddBuilding ( DWORD dwModelID )");
-
     if (m_ulBuildingCount <= MAX_BUILDINGS)
     {
         for (int i = 0; i < MAX_BUILDINGS; i++)
@@ -837,8 +782,6 @@ CBuilding* CPoolsSA::AddBuilding(DWORD dwModelID)
 
 CVehicle* CPoolsSA::AddTrain(CClientVehicle* pClientVehicle, CVector* vecPosition, DWORD dwModels[], int iSize, bool bDirection, uchar ucTrackId)
 {
-    DEBUG_TRACE("CVehicle* CPoolsSA::AddTrain ( CClientVehicle* pClientVehicle, CVector * vecPosition, DWORD dwModels[], int iSize, bool bDirection )");
-
     // clean the existing array
     MemSetFast((void*)VAR_TrainModelArray, 0, 32 * sizeof(DWORD));
 
diff --git a/Client/game_sa/CProjectileInfoSA.cpp b/Client/game_sa/CProjectileInfoSA.cpp
index 29e66702bb6..27c27acb795 100644
--- a/Client/game_sa/CProjectileInfoSA.cpp
+++ b/Client/game_sa/CProjectileInfoSA.cpp
@@ -15,12 +15,12 @@
 #include "CVehicleSA.h"
 
 extern CGameSA* pGame;
+
 /**
  * This destroys all the projectiles in the world
  */
 void CProjectileInfoSA::RemoveAllProjectiles()
 {
-    DEBUG_TRACE("void CProjectileInfoSA::RemoveAllProjectiles (  )");
     DWORD dwFunction = FUNC_RemoveAllProjectiles;
     _asm
     {
@@ -36,7 +36,6 @@ void CProjectileInfoSA::RemoveAllProjectiles()
  */
 CProjectile* CProjectileInfoSA::GetProjectile(DWORD ID)
 {
-    DEBUG_TRACE("CProjectile * CProjectileInfoSA::GetProjectile ( DWORD ID )");
     if (ID >= 0 && ID < 32)
         return (CProjectile*)(ARRAY_CProjectile + ID * sizeof(CProjectile*));
     else
@@ -125,8 +124,6 @@ CProjectileInfo* CProjectileInfoSA::GetProjectileInfo(DWORD dwIndex)
 
 bool CProjectileInfoSA::AddProjectile(CEntity* creator, eWeaponType eWeapon, CVector vecOrigin, float fForce, CVector* target, CEntity* targetEntity)
 {
-    DEBUG_TRACE("bool CProjectileInfoSA::AddProjectile ( CEntity * creator, eWeaponType eWeapon, CVector vecOffset, float fForce )");
-
     DWORD               dwFunction = FUNC_AddProjectile;
     DWORD               dwReturn = 0;
     CEntitySAInterface* creatorVC = NULL;
diff --git a/Client/game_sa/CProjectileSA.cpp b/Client/game_sa/CProjectileSA.cpp
index 6c7531a959c..b653ba24268 100644
--- a/Client/game_sa/CProjectileSA.cpp
+++ b/Client/game_sa/CProjectileSA.cpp
@@ -28,8 +28,6 @@ CProjectileSA::CProjectileSA(CProjectileSAInterface* projectileInterface) : CObj
 
 CProjectileSA::~CProjectileSA()
 {
-    DEBUG_TRACE("CProjectileSA::~CProjectileSA( )");
-
     this->BeingDeleted = true;
     /*
     //OutputDebugString("Attempting to destroy Object\n");
diff --git a/Client/game_sa/CQuadBikeSA.cpp b/Client/game_sa/CQuadBikeSA.cpp
index fae87a54038..dc08765a1cb 100644
--- a/Client/game_sa/CQuadBikeSA.cpp
+++ b/Client/game_sa/CQuadBikeSA.cpp
@@ -14,11 +14,9 @@
 
 CQuadBikeSA::CQuadBikeSA(CQuadBikeSAInterface* quadbike) : CAutomobileSA(quadbike)
 {
-    DEBUG_TRACE("CQuadBikeSA::CQuadBikeSA( CQuadBikeSAInterface * quadbike )");
     this->m_pInterface = quadbike;
 }
 
 CQuadBikeSA::CQuadBikeSA(eVehicleTypes dwModelID, unsigned char ucVariation, unsigned char ucVariation2) : CAutomobileSA(dwModelID, ucVariation, ucVariation2)
 {
-    DEBUG_TRACE("CQuadBikeSA::CQuadBikeSA( eVehicleTypes dwModelID ):CVehicleSA( dwModelID )");
 }
diff --git a/Client/game_sa/CRadarSA.cpp b/Client/game_sa/CRadarSA.cpp
index e57c06877c7..7d56516dbb9 100644
--- a/Client/game_sa/CRadarSA.cpp
+++ b/Client/game_sa/CRadarSA.cpp
@@ -17,7 +17,6 @@ CMarkerSA* Markers[MAX_MARKERS];
 
 CRadarSA::CRadarSA()
 {
-    DEBUG_TRACE("CRadarSA::CRadarSA (  )");
     for (int i = 0; i < MAX_MARKERS; i++)
         Markers[i] = new CMarkerSA((CMarkerSAInterface*)(ARRAY_CMarker + i * sizeof(CMarkerSAInterface)));
 }
@@ -33,7 +32,6 @@ CRadarSA::~CRadarSA()
 
 CMarker* CRadarSA::CreateMarker(CVector* vecPosition)
 {
-    DEBUG_TRACE("CMarker * CRadarSA::CreateMarker(CVector * vecPosition)");
     CMarkerSA* marker;
     marker = (CMarkerSA*)this->GetFreeMarker();
     if (marker)
@@ -47,7 +45,6 @@ CMarker* CRadarSA::CreateMarker(CVector* vecPosition)
 
 CMarker* CRadarSA::GetFreeMarker()
 {
-    DEBUG_TRACE("CMarker * CRadarSA::GetFreeMarker(  )");
     int Index;
     Index = 0;
     while ((Index < MAX_MARKERS) && (Markers[Index]->GetInterface()->bTrackingBlip))
diff --git a/Client/game_sa/CRegisteredCoronaSA.cpp b/Client/game_sa/CRegisteredCoronaSA.cpp
index 7da8df16b30..e27403b36d2 100644
--- a/Client/game_sa/CRegisteredCoronaSA.cpp
+++ b/Client/game_sa/CRegisteredCoronaSA.cpp
@@ -15,61 +15,51 @@
 
 CRegisteredCoronaSA::CRegisteredCoronaSA(CRegisteredCoronaSAInterface* coronaInterface)
 {
-    DEBUG_TRACE("CRegisteredCoronaSA::CRegisteredCoronaSA(CRegisteredCoronaSAInterface * coronaInterface)");
     internalInterface = coronaInterface;
 }
 
 CVector* CRegisteredCoronaSA::GetPosition()
 {
-    DEBUG_TRACE("CVector * CRegisteredCoronaSA::GetPosition()");
     return &internalInterface->Coordinates;
 }
 
 void CRegisteredCoronaSA::SetPosition(CVector* vector)
 {
-    DEBUG_TRACE("VOID CRegisteredCoronaSA::SetPosition(CVector * vector)");
     MemCpyFast(&internalInterface->Coordinates, vector, sizeof(CVector));
 }
 
 float CRegisteredCoronaSA::GetSize()
 {
-    DEBUG_TRACE("FLOAT CRegisteredCoronaSA::GetSize()");
     return internalInterface->Size;
 }
 
 void CRegisteredCoronaSA::SetSize(float fSize)
 {
-    DEBUG_TRACE("VOID CRegisteredCoronaSA::SetSize(FLOAT fSize)");
     internalInterface->Size = fSize;
 }
 
 float CRegisteredCoronaSA::GetRange()
 {
-    DEBUG_TRACE("FLOAT CRegisteredCoronaSA::GetRange()");
     return internalInterface->Range;
 }
 
 void CRegisteredCoronaSA::SetRange(float fRange)
 {
-    DEBUG_TRACE("VOID CRegisteredCoronaSA::SetRange(FLOAT fRange)");
     internalInterface->Range = fRange;
 }
 
 float CRegisteredCoronaSA::GetPullTowardsCamera()
 {
-    DEBUG_TRACE("FLOAT CRegisteredCoronaSA::GetPullTowardsCamera()");
     return internalInterface->PullTowardsCam;
 }
 
 void CRegisteredCoronaSA::SetPullTowardsCamera(float fPullTowardsCamera)
 {
-    DEBUG_TRACE("VOID CRegisteredCoronaSA::SetPullTowardsCamera(FLOAT fPullTowardsCamera)");
     internalInterface->PullTowardsCam = fPullTowardsCamera;
 }
 
 void CRegisteredCoronaSA::SetColor(BYTE Red, BYTE Green, BYTE Blue, BYTE Alpha)
 {
-    DEBUG_TRACE("VOID CRegisteredCoronaSA::SetColor(BYTE Red, BYTE Green, BYTE Blue, BYTE Alpha)");
     internalInterface->Red = Red;
     internalInterface->Green = Green;
     internalInterface->Blue = Blue;
@@ -79,13 +69,11 @@ void CRegisteredCoronaSA::SetColor(BYTE Red, BYTE Green, BYTE Blue, BYTE Alpha)
 
 void CRegisteredCoronaSA::SetTexture(RwTexture* texture)
 {
-    DEBUG_TRACE("VOID CRegisteredCoronaSA::SetTexture(RwTexture * texture)");
     internalInterface->pTex = texture;
 }
 
 void CRegisteredCoronaSA::SetTexture(eCoronaType texture)
 {
-    DEBUG_TRACE("VOID CRegisteredCoronaSA::SetTexture(eCoronaType texture)");
     CCoronasSA* coronas = ((CCoronasSA*)pGame->GetCoronas());
     RwTexture*  tex = coronas->GetTexture(texture);
     if (tex)
@@ -98,13 +86,11 @@ void CRegisteredCoronaSA::SetTexture(eCoronaType texture)
  */
 BYTE CRegisteredCoronaSA::GetFlareType()
 {
-    DEBUG_TRACE("BYTE CRegisteredCoronaSA::GetFlareType()");
     return internalInterface->FlareType;
 }
 
 void CRegisteredCoronaSA::SetFlareType(BYTE fFlareType)
 {
-    DEBUG_TRACE("VOID CRegisteredCoronaSA::SetFlareType(BYTE fFlareType)");
     internalInterface->FlareType = fFlareType;
 }
 
@@ -115,13 +101,11 @@ void CRegisteredCoronaSA::SetReflectionType(BYTE reflectionType)
 
 DWORD CRegisteredCoronaSA::GetID()
 {
-    DEBUG_TRACE("DWORD CRegisteredCoronaSA::GetID()");
     return ((DWORD)internalInterface - ARRAY_CORONAS) / sizeof(CRegisteredCoronaSAInterface);
 }
 
 void CRegisteredCoronaSA::Init(DWORD Identifier)
 {
-    DEBUG_TRACE("VOID CRegisteredCoronaSA::Init(DWORD Identifier)");
     internalInterface->Identifier = Identifier;
     this->SetSize(2.5f);
     internalInterface->bIsAttachedToEntity = false;
@@ -142,7 +126,6 @@ void CRegisteredCoronaSA::Init(DWORD Identifier)
 
 void CRegisteredCoronaSA::Refresh()
 {
-    DEBUG_TRACE("VOID CRegisteredCoronaSA::Refresh()");
     internalInterface->JustCreated = 1;
 }
 
diff --git a/Client/game_sa/CStreamingSA.cpp b/Client/game_sa/CStreamingSA.cpp
index aff731d2622..8c97d859a7f 100644
--- a/Client/game_sa/CStreamingSA.cpp
+++ b/Client/game_sa/CStreamingSA.cpp
@@ -80,7 +80,7 @@ void CStreamingSA::RemoveModel(std::uint32_t model)
     function(model);
 }
 
-void CStreamingSA::LoadAllRequestedModels(BOOL bOnlyPriorityModels, const char* szTag)
+void CStreamingSA::LoadAllRequestedModels(bool bOnlyPriorityModels, const char* szTag)
 {
     TIMEUS startTime = GetTimeUs();
 
@@ -101,7 +101,7 @@ void CStreamingSA::LoadAllRequestedModels(BOOL bOnlyPriorityModels, const char*
     }
 }
 
-BOOL CStreamingSA::HasModelLoaded(DWORD dwModelID)
+bool CStreamingSA::HasModelLoaded(DWORD dwModelID)
 {
     if (IsUpgradeModelId(dwModelID))
     {
@@ -119,13 +119,12 @@ BOOL CStreamingSA::HasModelLoaded(DWORD dwModelID)
     else
     {
         DWORD dwFunc = FUNC_CStreaming__HasModelLoaded;
-        BOOL  bReturn = 0;
+        bool bReturn = 0;
         _asm
         {
             push    dwModelID
             call    dwFunc
-            movzx   eax, al
-            mov     bReturn, eax
+            mov     bReturn, al
             pop     eax
         }
 
diff --git a/Client/game_sa/CStreamingSA.h b/Client/game_sa/CStreamingSA.h
index 6c879d26378..77915a8c48a 100644
--- a/Client/game_sa/CStreamingSA.h
+++ b/Client/game_sa/CStreamingSA.h
@@ -23,8 +23,8 @@ class CStreamingSA final : public CStreaming
 public:
     void            RequestModel(DWORD dwModelID, DWORD dwFlags);
     void            RemoveModel(std::uint32_t model) override;
-    void            LoadAllRequestedModels(BOOL bOnlyPriorityModels = 0, const char* szTag = NULL);
-    BOOL            HasModelLoaded(DWORD dwModelID);
+    void            LoadAllRequestedModels(bool bOnlyPriorityModels = false, const char* szTag = NULL);
+    bool            HasModelLoaded(DWORD dwModelID);
     void            RequestSpecialModel(DWORD model, const char* szTexture, DWORD channel);
     void            ReinitStreaming();
     CStreamingInfo* GetStreamingInfoFromModelId(uint32 id);
diff --git a/Client/game_sa/CTaskManagerSA.cpp b/Client/game_sa/CTaskManagerSA.cpp
index 1ffa359e345..f990b6c47be 100644
--- a/Client/game_sa/CTaskManagerSA.cpp
+++ b/Client/game_sa/CTaskManagerSA.cpp
@@ -16,7 +16,6 @@
 
 CTaskManagerSA::CTaskManagerSA(CTaskManagerSAInterface* taskManagerInterface, CPed* ped)
 {
-    DEBUG_TRACE("CTaskManagerSA::CTaskManagerSA(CTaskManagerSAInterface * taskManagerInterface, CPed * ped)");
     this->ped = ped;
     this->internalInterface = taskManagerInterface;
     this->m_pTaskManagementSystem = pGame->GetTaskManagementSystem();
@@ -32,8 +31,6 @@ void CTaskManagerSA::RemoveTask(const int iTaskPriority)
 
 void CTaskManagerSA::SetTask(CTaskSA* pTaskPrimary, const int iTaskPriority, const bool bForceNewTask)
 {
-    DEBUG_TRACE("void CTaskManagerSA::SetTask(CTask* pTaskPrimary, const int iTaskPriority, const bool bForceNewTask)");
-
     DWORD             dwFunc = FUNC_SetTask;
     CTaskSAInterface* taskInterface = NULL;
     if (pTaskPrimary)
@@ -54,14 +51,12 @@ void CTaskManagerSA::SetTask(CTaskSA* pTaskPrimary, const int iTaskPriority, con
 
 CTask* CTaskManagerSA::GetTask(const int iTaskPriority)
 {
-    DEBUG_TRACE("CTask* CTaskManagerSA::GetTask(const int iTaskPriority)");
     CTaskManagerSAInterface* pTaskManagerInterface = this->GetInterface();
     return m_pTaskManagementSystem->GetTask(pTaskManagerInterface->m_tasks[iTaskPriority]);
 }
 
 CTask* CTaskManagerSA::GetActiveTask()
 {
-    DEBUG_TRACE("CTask* CTaskManagerSA::GetActiveTask()");
     DWORD dwFunc = FUNC_GetActiveTask;
     DWORD dwReturn = 0;
     DWORD dwThis = (DWORD)this->GetInterface();
@@ -81,7 +76,6 @@ CTask* CTaskManagerSA::GetActiveTask()
 
 CTask* CTaskManagerSA::GetSimplestActiveTask()
 {
-    DEBUG_TRACE("CTask* CTaskManagerSA::GetSimplestActiveTask()");
     DWORD dwFunc = FUNC_GetSimplestActiveTask;
     DWORD dwReturn = 0;
     DWORD dwThis = (DWORD)this->GetInterface();
@@ -99,7 +93,6 @@ CTask* CTaskManagerSA::GetSimplestActiveTask()
 
 CTask* CTaskManagerSA::GetSimplestTask(const int iPriority)
 {
-    DEBUG_TRACE("CTask* CTaskManagerSA::GetSimplestTask(const int iPriority)");
     DWORD dwFunc = FUNC_GetSimplestTask;
     DWORD dwReturn = 0;
     DWORD dwThis = (DWORD)this->GetInterface();
@@ -117,7 +110,6 @@ CTask* CTaskManagerSA::GetSimplestTask(const int iPriority)
 
 CTask* CTaskManagerSA::FindActiveTaskByType(const int iTaskType)
 {
-    DEBUG_TRACE("CTask* CTaskManagerSA::FindActiveTaskByType(const int iTaskType)");
     DWORD dwFunc = FUNC_FindActiveTaskByType;
     DWORD dwReturn = 0;
     DWORD dwThis = (DWORD)this->GetInterface();
@@ -135,7 +127,6 @@ CTask* CTaskManagerSA::FindActiveTaskByType(const int iTaskType)
 
 CTask* CTaskManagerSA::FindTaskByType(const int iPriority, const int iTaskType)
 {
-    DEBUG_TRACE("CTask* CTaskManagerSA::FindTaskByType(const int iPriority, const int iTaskType)");
     DWORD dwFunc = FUNC_FindTaskByType;
     DWORD dwReturn = 0;
     DWORD dwThis = (DWORD)this->GetInterface();
@@ -159,7 +150,6 @@ void CTaskManagerSA::RemoveTaskSecondary(const int iTaskPriority)
 
 void CTaskManagerSA::SetTaskSecondary(CTaskSA* pTaskSecondary, const int iType)
 {
-    DEBUG_TRACE("void CTaskManagerSA::SetTaskSecondary(CTask* pTaskSecondary, const int iType)");
     DWORD             dwFunc = FUNC_SetTaskSecondary;
     CTaskSAInterface* taskInterface = NULL;
     if (pTaskSecondary)
@@ -179,7 +169,6 @@ void CTaskManagerSA::SetTaskSecondary(CTaskSA* pTaskSecondary, const int iType)
  */
 CTask* CTaskManagerSA::GetTaskSecondary(const int iType)
 {
-    DEBUG_TRACE("CTask* CTaskManagerSA::GetTaskSecondary(const int iType)");
     if (iType < TASK_SECONDARY_MAX)
         return m_pTaskManagementSystem->GetTask(this->GetInterface()->m_tasksSecondary[iType]);
     else
@@ -188,7 +177,6 @@ CTask* CTaskManagerSA::GetTaskSecondary(const int iType)
 
 bool CTaskManagerSA::HasTaskSecondary(const CTask* pTaskSecondary)
 {
-    DEBUG_TRACE("bool CTaskManagerSA::HasTaskSecondary(const CTask* pTaskSecondary)");
     DWORD dwFunc = FUNC_HasTaskSecondary;
     bool  bReturn = false;
     _asm
@@ -202,7 +190,6 @@ bool CTaskManagerSA::HasTaskSecondary(const CTask* pTaskSecondary)
 
 void CTaskManagerSA::ClearTaskEventResponse()
 {
-    DEBUG_TRACE("void CTaskManagerSA::ClearTaskEventResponse()");
     DWORD dwFunc = FUNC_ClearTaskEventResponse;
     _asm
     {
@@ -212,7 +199,6 @@ void CTaskManagerSA::ClearTaskEventResponse()
 
 void CTaskManagerSA::Flush(const int iPriority)
 {
-    DEBUG_TRACE("void CTaskManagerSA::Flush(bool bImmediately)");
     for (int i = 0; i < TASK_PRIORITY_MAX; i++)
     {
         CTask* pTask = GetTask(i);
diff --git a/Client/game_sa/CTasksSA.cpp b/Client/game_sa/CTasksSA.cpp
index 96e274e2e20..89eb0deddaa 100644
--- a/Client/game_sa/CTasksSA.cpp
+++ b/Client/game_sa/CTasksSA.cpp
@@ -25,14 +25,11 @@
 
 CTasksSA::CTasksSA(CTaskManagementSystemSA* pTaskManagementSystem)
 {
-    DEBUG_TRACE("CTasksSA::CTasksSA ( CTaskManagementSystemSA* pTaskManagementSystem )");
     m_pTaskManagementSystem = pTaskManagementSystem;
 }
 
 CTaskSimplePlayerOnFoot* CTasksSA::CreateTaskSimplePlayerOnFoot()
 {
-    DEBUG_TRACE("CTaskSimplePlayerOnFoot* CTasksSA::CreateTaskSimplePlayerOnFoot ( void )");
-
     CTaskSimplePlayerOnFootSA* pTask = NewTask<CTaskSimplePlayerOnFootSA>();
     m_pTaskManagementSystem->AddTask(pTask);
     return pTask;
@@ -40,8 +37,6 @@ CTaskSimplePlayerOnFoot* CTasksSA::CreateTaskSimplePlayerOnFoot()
 
 CTaskComplexFacial* CTasksSA::CreateTaskComplexFacial()
 {
-    DEBUG_TRACE("CTaskComplexFacial* CTasksSA::CreateTaskComplexFacial ( void )");
-
     CTaskComplexFacialSA* pTask = NewTask<CTaskComplexFacialSA>();
     m_pTaskManagementSystem->AddTask(pTask);
     return pTask;
@@ -49,7 +44,6 @@ CTaskComplexFacial* CTasksSA::CreateTaskComplexFacial()
 
 CTaskSimpleCarSetPedInAsDriver* CTasksSA::CreateTaskSimpleCarSetPedInAsDriver(CVehicle* pVehicle)
 {
-    DEBUG_TRACE("CTaskSimpleCarSetPedInAsDriver * CTasksSA::CreateTaskSimpleCarSetPedInAsDriver(CVehicle * pVehicle)");
     CTaskSimpleCarSetPedInAsDriverSA* pTask = NewTask<CTaskSimpleCarSetPedInAsDriverSA>(pVehicle, (CTaskUtilityLineUpPedWithCar*)NULL);
     m_pTaskManagementSystem->AddTask(pTask);
     return pTask;
@@ -57,7 +51,6 @@ CTaskSimpleCarSetPedInAsDriver* CTasksSA::CreateTaskSimpleCarSetPedInAsDriver(CV
 
 CTaskSimpleCarSetPedInAsPassenger* CTasksSA::CreateTaskSimpleCarSetPedInAsPassenger(CVehicle* pVehicle, int iTargetDoor)
 {
-    DEBUG_TRACE("CTaskSimpleCarSetPedInAsPassenger * CTasksSA::CreateTaskSimpleCarSetPedInAsPassenger(CVehicle * pVehicle, int iTargetDoor)");
     CTaskSimpleCarSetPedInAsPassengerSA* pTask = NewTask<CTaskSimpleCarSetPedInAsPassengerSA>(pVehicle, iTargetDoor, (CTaskUtilityLineUpPedWithCar*)NULL);
     m_pTaskManagementSystem->AddTask(pTask);
     return pTask;
@@ -65,7 +58,6 @@ CTaskSimpleCarSetPedInAsPassenger* CTasksSA::CreateTaskSimpleCarSetPedInAsPassen
 
 CTaskSimpleCarSetPedOut* CTasksSA::CreateTaskSimpleCarSetPedOut(CVehicle* pVehicle, int iTargetDoor, bool bSwitchOffEngine)
 {
-    DEBUG_TRACE("CTaskSimpleCarSetPedOut * CTasksSA::CreateTaskSimpleCarSetPedOut(CVehicle * pVehicle, int iTargetDoor, bool bSwitchOffEngine)");
     CTaskSimpleCarSetPedOutSA* pTask = NewTask<CTaskSimpleCarSetPedOutSA>(pVehicle, iTargetDoor, bSwitchOffEngine);
     m_pTaskManagementSystem->AddTask(pTask);
     return pTask;
@@ -73,8 +65,6 @@ CTaskSimpleCarSetPedOut* CTasksSA::CreateTaskSimpleCarSetPedOut(CVehicle* pVehic
 
 CTaskComplexWanderStandard* CTasksSA::CreateTaskComplexWanderStandard(const int iMoveState, const char iDir, const bool bWanderSensibly)
 {
-    DEBUG_TRACE(
-        "CTaskComplexWanderStandard * CTasksSA::CreateTaskComplexWanderStandard(const int iMoveState, const unsigned char iDir, const bool bWanderSensibly)");
     CTaskComplexWanderStandardSA* pTask = NewTask<CTaskComplexWanderStandardSA>(iMoveState, iDir, bWanderSensibly);
     m_pTaskManagementSystem->AddTask(pTask);
     return pTask;
@@ -82,7 +72,6 @@ CTaskComplexWanderStandard* CTasksSA::CreateTaskComplexWanderStandard(const int
 
 CTaskComplexEnterCarAsDriver* CTasksSA::CreateTaskComplexEnterCarAsDriver(CVehicle* pVehicle)
 {
-    DEBUG_TRACE("CTaskComplexEnterCarAsDriver * CTasksSA::CreateTaskComplexEnterCarAsDriver(CVehicle * pVehicle)");
     CTaskComplexEnterCarAsDriverSA* pTask = NewTask<CTaskComplexEnterCarAsDriverSA>(pVehicle);
     m_pTaskManagementSystem->AddTask(pTask);
     return pTask;
@@ -90,9 +79,6 @@ CTaskComplexEnterCarAsDriver* CTasksSA::CreateTaskComplexEnterCarAsDriver(CVehic
 
 CTaskComplexEnterCarAsPassenger* CTasksSA::CreateTaskComplexEnterCarAsPassenger(CVehicle* pVehicle, const int iTargetSeat, const bool bCarryOnAfterFallingOff)
 {
-    DEBUG_TRACE(
-        "CTaskComplexEnterCarAsPassenger * CTasksSA::CTaskComplexEnterCarAsPassenger(CVehicle * pVehicle, const int iTargetSeat, const bool "
-        "bCarryOnAfterFallingOff)");
     CTaskComplexEnterCarAsPassengerSA* pTask = NewTask<CTaskComplexEnterCarAsPassengerSA>(pVehicle, iTargetSeat, bCarryOnAfterFallingOff);
     m_pTaskManagementSystem->AddTask(pTask);
     return pTask;
@@ -100,7 +86,6 @@ CTaskComplexEnterCarAsPassenger* CTasksSA::CreateTaskComplexEnterCarAsPassenger(
 
 CTaskComplexEnterBoatAsDriver* CTasksSA::CreateTaskComplexEnterBoatAsDriver(CVehicle* pVehicle)
 {
-    DEBUG_TRACE("CTaskComplexEnterBoatAsDriver * CTasksSA::CreateTaskComplexEnterBoatAsDriver(CVehicle * pVehicle)");
     CTaskComplexEnterBoatAsDriverSA* pTask = NewTask<CTaskComplexEnterBoatAsDriverSA>(pVehicle);
     m_pTaskManagementSystem->AddTask(pTask);
     return pTask;
@@ -109,9 +94,6 @@ CTaskComplexEnterBoatAsDriver* CTasksSA::CreateTaskComplexEnterBoatAsDriver(CVeh
 CTaskComplexLeaveCar* CTasksSA::CreateTaskComplexLeaveCar(CVehicle* pVehicle, const int iTargetDoor, const int iDelayTime, const bool bSensibleLeaveCar,
                                                           const bool bForceGetOut)
 {
-    DEBUG_TRACE(
-        "CTaskComplexLeaveCar * CTasksSA::CreateTaskComplexLeaveCar ( CVehicle* pTargetVehicle, const int iTargetDoor, const int iDelayTime, const bool "
-        "bSensibleLeaveCar, const bool bForceGetOut )");
     CTaskComplexLeaveCarSA* pTask = NewTask<CTaskComplexLeaveCarSA>(pVehicle, iTargetDoor, iDelayTime, bSensibleLeaveCar, bForceGetOut);
     m_pTaskManagementSystem->AddTask(pTask);
     return pTask;
@@ -119,7 +101,6 @@ CTaskComplexLeaveCar* CTasksSA::CreateTaskComplexLeaveCar(CVehicle* pVehicle, co
 
 CTaskComplexUseMobilePhone* CTasksSA::CreateTaskComplexUseMobilePhone(const int iDuration)
 {
-    DEBUG_TRACE("CTaskComplexUseMobilePhone* CTasksSA::CreateTaskComplexUseMobilePhone ( const int iDuration )");
     CTaskComplexUseMobilePhoneSA* pTask = NewTask<CTaskComplexUseMobilePhoneSA>(iDuration);
     m_pTaskManagementSystem->AddTask(pTask);
     return pTask;
@@ -127,9 +108,6 @@ CTaskComplexUseMobilePhone* CTasksSA::CreateTaskComplexUseMobilePhone(const int
 
 CTaskSimpleDuck* CTasksSA::CreateTaskSimpleDuck(eDuckControlTypes nDuckControl, unsigned short nLengthOfDuck, unsigned short nUseShotsWhizzingEvents)
 {
-    DEBUG_TRACE(
-        "CTaskSimpleDuck * CTasksSA::CreateTaskSimpleDuck ( eDuckControlTypes nDuckControl, unsigned short nLengthOfDuck, unsigned short "
-        "nUseShotsWhizzingEvents )");
     CTaskSimpleDuckSA* pTask = NewTask<CTaskSimpleDuckSA>(nDuckControl, nLengthOfDuck, nUseShotsWhizzingEvents);
     m_pTaskManagementSystem->AddTask(pTask);
     return pTask;
@@ -137,7 +115,6 @@ CTaskSimpleDuck* CTasksSA::CreateTaskSimpleDuck(eDuckControlTypes nDuckControl,
 
 CTaskSimpleChoking* CTasksSA::CreateTaskSimpleChoking(CPed* pAttacker, bool bIsTearGas)
 {
-    DEBUG_TRACE("CTaskSimpleChoking * CTasksSA::CreateTaskSimpleChoking ( void )");
     CTaskSimpleChokingSA* pTask = NewTask<CTaskSimpleChokingSA>(pAttacker, bIsTearGas);
     m_pTaskManagementSystem->AddTask(pTask);
     return pTask;
@@ -146,9 +123,6 @@ CTaskSimpleChoking* CTasksSA::CreateTaskSimpleChoking(CPed* pAttacker, bool bIsT
 CTaskSimpleClimb* CTasksSA::CreateTaskSimpleClimb(CEntity* pClimbEnt, const CVector& vecTarget, float fHeading, unsigned char nSurfaceType, char nHeight,
                                                   const bool bForceClimb)
 {
-    DEBUG_TRACE(
-        "CTaskSimpleClimb* CTasksSA::CreateTaskSimpleClimb ( CEntity *pClimbEnt, const CVector &vecTarget, float fHeading, unsigned char nSurfaceType, char "
-        "nHeight, const bool bForceClimb )");
     CTaskSimpleClimbSA* pTask = NewTask<CTaskSimpleClimbSA>(pClimbEnt, vecTarget, fHeading, nSurfaceType, nHeight, bForceClimb);
     m_pTaskManagementSystem->AddTask(pTask);
     return pTask;
@@ -156,7 +130,6 @@ CTaskSimpleClimb* CTasksSA::CreateTaskSimpleClimb(CEntity* pClimbEnt, const CVec
 
 CTaskSimpleJetPack* CTasksSA::CreateTaskSimpleJetpack(const CVector* pVecTargetPos, float fCruiseHeight, int nHoverTime)
 {
-    DEBUG_TRACE("CTaskSimpleJetPack * CTasksSA::CreateTaskSimpleJetpack ( const CVector *pVecTargetPos, float fCruiseHeight, int nHoverTime )");
     CTaskSimpleJetPackSA* pTask = NewTask<CTaskSimpleJetPackSA>(pVecTargetPos, fCruiseHeight, nHoverTime);
     m_pTaskManagementSystem->AddTask(pTask);
     return pTask;
@@ -165,10 +138,6 @@ CTaskSimpleJetPack* CTasksSA::CreateTaskSimpleJetpack(const CVector* pVecTargetP
 CTaskSimpleRunAnim* CTasksSA::CreateTaskSimpleRunAnim(const AssocGroupId animGroup, const AnimationId animID, const float fBlendDelta, const int iTaskType,
                                                       const char* pTaskName, const bool bHoldLastFrame)
 {
-    DEBUG_TRACE(
-        "CTaskSimpleRunAnim* CTasksSA::CreateTaskSimpleRunAnim ( const AssocGroupId animGroup, const AnimationId animID, const float fBlendDelta,  const int "
-        "iTaskType, const char* pTaskName, const bool bHoldLastFrame = false )");
-
     CTaskSimpleRunAnimSA* pTask = NewTask<CTaskSimpleRunAnimSA>(animGroup, animID, fBlendDelta, iTaskType, pTaskName, bHoldLastFrame);
     m_pTaskManagementSystem->AddTask(pTask);
     return pTask;
@@ -178,10 +147,6 @@ CTaskSimpleRunNamedAnim* CTasksSA::CreateTaskSimpleRunNamedAnim(const char* pAni
                                                                 const int iTime, const bool bDontInterrupt, const bool bRunInSequence, const bool bOffsetPed,
                                                                 const bool bHoldLastFrame)
 {
-    DEBUG_TRACE(
-        "CTaskSimpleRunNamedAnim* CTasksSA::CreateTaskSimpleRunNamedAnim ( const char* pAnimName, const char* pAnimGroupName, const int flags, const float "
-        "fBlendDelta, const int iTime, const bool bDontInterrupt, const bool bRunInSequence, const bool bOffsetPed, const bool bHoldLastFrame )");
-
     CTaskSimpleRunNamedAnimSA* pTask =
         NewTask<CTaskSimpleRunNamedAnimSA>(pAnimName, pAnimGroupName, flags, fBlendDelta, iTime, bDontInterrupt, bRunInSequence, bOffsetPed, bHoldLastFrame);
     m_pTaskManagementSystem->AddTask(pTask);
@@ -192,11 +157,6 @@ CTaskComplexDie* CTasksSA::CreateTaskComplexDie(const eWeaponType eMeansOfDeath,
                                                 const float fAnimSpeed, const bool bBeingKilledByStealth, const bool bFallingToDeath, const int iFallToDeathDir,
                                                 const bool bFallToDeathOverRailing)
 {
-    DEBUG_TRACE(
-        "CTaskComplexDie* CTasksSA::CreateTaskComplexDie ( const eWeaponType eMeansOfDeath, const AssocGroupId animGroup, const AnimationId anim, const float "
-        "fBlendDelta, const float fAnimSpeed, const bool bBeingKilledByStealth, const bool bFallingToDeath, const int iFallToDeathDir, const bool "
-        "bFallToDeathOverRailing )");
-
     CTaskComplexDieSA* pTask = NewTask<CTaskComplexDieSA>(eMeansOfDeath, animGroup, anim, fBlendDelta, fAnimSpeed, bBeingKilledByStealth, bFallingToDeath,
                                                           iFallToDeathDir, bFallToDeathOverRailing);
     m_pTaskManagementSystem->AddTask(pTask);
@@ -205,8 +165,6 @@ CTaskComplexDie* CTasksSA::CreateTaskComplexDie(const eWeaponType eMeansOfDeath,
 
 CTaskSimpleStealthKill* CTasksSA::CreateTaskSimpleStealthKill(bool bKiller, class CPed* pPed, const AnimationId animGroup)
 {
-    DEBUG_TRACE("CTaskSimpleStealthKill* CTasksSA::CreateTaskSimpleStealthKill ( bool bKiller, class CPed * pPed, const AnimationId anim )");
-
     CTaskSimpleStealthKillSA* pTask = NewTask<CTaskSimpleStealthKillSA>(bKiller, pPed, animGroup);
     m_pTaskManagementSystem->AddTask(pTask);
     return pTask;
@@ -214,8 +172,6 @@ CTaskSimpleStealthKill* CTasksSA::CreateTaskSimpleStealthKill(bool bKiller, clas
 
 CTaskSimpleDead* CTasksSA::CreateTaskSimpleDead(unsigned int uiDeathTimeMS, bool bUnk)
 {
-    DEBUG_TRACE("CTaskSimpleDead* CTasksSA::CreateTaskSimpleDead ( unsigned int uiDeathTimeMS, bool bUnk )");
-
     CTaskSimpleDeadSA* pTask = NewTask<CTaskSimpleDeadSA>(uiDeathTimeMS, bUnk);
     m_pTaskManagementSystem->AddTask(pTask);
     return pTask;
@@ -223,8 +179,6 @@ CTaskSimpleDead* CTasksSA::CreateTaskSimpleDead(unsigned int uiDeathTimeMS, bool
 
 CTaskSimpleBeHit* CTasksSA::CreateTaskSimpleBeHit(CPed* pPedAttacker, ePedPieceTypes hitBodyPart, int hitBodySide, int weaponId)
 {
-    DEBUG_TRACE("CTaskSimpleBeHit* CTasksSA::CreateTaskSimpleBeHit ( CPed* pPedAttacker, ePedPieceTypes hitBodyPart, int hitBodySide, int weaponId )");
-
     CTaskSimpleBeHitSA* pTask = NewTask<CTaskSimpleBeHitSA>(pPedAttacker, hitBodyPart, hitBodySide, weaponId);
     m_pTaskManagementSystem->AddTask(pTask);
     return pTask;
@@ -232,8 +186,6 @@ CTaskSimpleBeHit* CTasksSA::CreateTaskSimpleBeHit(CPed* pPedAttacker, ePedPieceT
 
 CTaskComplexSunbathe* CTasksSA::CreateTaskComplexSunbathe(class CObject* pTowel, const bool bStartStanding)
 {
-    DEBUG_TRACE("CTaskComplexSunbathe* CTasksSA::CreateTaskComplexSunbathe ( class CObject* pTowel, const bool bStartStanding )");
-
     CTaskComplexSunbatheSA* pTask = NewTask<CTaskComplexSunbatheSA>(pTowel, bStartStanding);
     m_pTaskManagementSystem->AddTask(pTask);
     return pTask;
@@ -242,10 +194,6 @@ CTaskComplexSunbathe* CTasksSA::CreateTaskComplexSunbathe(class CObject* pTowel,
 CTaskSimpleIKChain* CTasksSA::CreateTaskSimpleIKChain(char* idString, int effectorBoneTag, CVector effectorVec, int pivotBoneTag, CEntity* pEntity,
                                                       int offsetBoneTag, CVector offsetPos, float speed, int time, int blendTime)
 {
-    DEBUG_TRACE(
-        "CTaskSimpleIKChain* CTasksSA::CreateTaskSimpleIKChain ( char* idString, int effectorBoneTag, CVector effectorVec, int pivotBoneTag, CEntity* pEntity, "
-        "int offsetBoneTag, CVector offsetPos, float speed, int time, int blendTime )");
-
     CTaskSimpleIKChainSA* pTask =
         NewTask<CTaskSimpleIKChainSA>(idString, effectorBoneTag, effectorVec, pivotBoneTag, pEntity, offsetBoneTag, offsetPos, speed, time, blendTime);
     m_pTaskManagementSystem->AddTask(pTask);
@@ -255,10 +203,6 @@ CTaskSimpleIKChain* CTasksSA::CreateTaskSimpleIKChain(char* idString, int effect
 CTaskSimpleIKLookAt* CTasksSA::CreateTaskSimpleIKLookAt(char* idString, CEntity* pEntity, int time, int offsetBoneTag, CVector offsetPos,
                                                         unsigned char useTorso, float speed, int blendTime, int m_priority)
 {
-    DEBUG_TRACE(
-        "CTaskSimpleIKLookAt* CTasksSA::CreateTaskSimpleIKLookAt ( char* idString, CEntity* pEntity, int time, int offsetBoneTag, CVector offsetPos, unsigned "
-        "char useTorso, float speed, int blendTime, int m_priority )");
-
     CTaskSimpleIKLookAtSA* pTask = NewTask<CTaskSimpleIKLookAtSA>(idString, pEntity, time, offsetBoneTag, offsetPos, useTorso, speed, blendTime, m_priority);
     m_pTaskManagementSystem->AddTask(pTask);
     return pTask;
@@ -267,10 +211,6 @@ CTaskSimpleIKLookAt* CTasksSA::CreateTaskSimpleIKLookAt(char* idString, CEntity*
 CTaskSimpleTriggerLookAt* CTasksSA::CreateTaskSimpleTriggerLookAt(CEntity* pEntity, int time, int offsetBoneTag, CVector offsetPos, unsigned char useTorso,
                                                                   float speed, int blendTime, int priority)
 {
-    DEBUG_TRACE(
-        "CTaskSimpleTriggerLookAt* CTasksSA::CreateTaskSimpleTriggerLookAt ( CEntity* pEntity, int time, int offsetBoneTag, CVector offsetPos, unsigned char "
-        "useTorso, float speed, int blendTime, int priority )");
-
     CTaskSimpleTriggerLookAtSA* pTask = NewTask<CTaskSimpleTriggerLookAtSA>(pEntity, time, offsetBoneTag, offsetPos, useTorso, speed, blendTime, priority);
     m_pTaskManagementSystem->AddTask(pTask);
     return pTask;
@@ -279,10 +219,6 @@ CTaskSimpleTriggerLookAt* CTasksSA::CreateTaskSimpleTriggerLookAt(CEntity* pEnti
 CTaskSimpleGangDriveBy* CTasksSA::CreateTaskSimpleGangDriveBy(CEntity* pTargetEntity, const CVector* pVecTarget, float fAbortRange, char FrequencyPercentage,
                                                               char nDrivebyStyle, bool bSeatRHS)
 {
-    DEBUG_TRACE(
-        "CTaskSimpleGangDriveBy* CTasksSA::CreateTaskSimpleGangDriveBy ( CEntity *pTargetEntity, const CVector *pVecTarget, float fAbortRange, char "
-        "FrequencyPercentage, char nDrivebyStyle, bool bSeatRHS )");
-
     CTaskSimpleGangDriveBySA* pTask = NewTask<CTaskSimpleGangDriveBySA>(pTargetEntity, pVecTarget, fAbortRange, FrequencyPercentage, nDrivebyStyle, bSeatRHS);
     m_pTaskManagementSystem->AddTask(pTask);
     return pTask;
@@ -290,10 +226,6 @@ CTaskSimpleGangDriveBy* CTasksSA::CreateTaskSimpleGangDriveBy(CEntity* pTargetEn
 
 CTaskSimpleUseGun* CTasksSA::CreateTaskSimpleUseGun(CEntity* pTargetEntity, CVector vecTarget, char nCommand, short nBurstLength, unsigned char bAimImmediate)
 {
-    DEBUG_TRACE(
-        "CTaskSimpleUseGun* CTasksSA::CreateTaskSimpleUseGun ( CEntity * pTargetEntity, CVector vecTarget, char nCommand, short nBurstLength, unsigned char "
-        "bAimImmediate )");
-
     CTaskSimpleUseGunSA* pTask = NewTask<CTaskSimpleUseGunSA>(pTargetEntity, vecTarget, nCommand, nBurstLength, bAimImmediate);
     m_pTaskManagementSystem->AddTask(pTask);
     return pTask;
@@ -301,8 +233,6 @@ CTaskSimpleUseGun* CTasksSA::CreateTaskSimpleUseGun(CEntity* pTargetEntity, CVec
 
 CTaskSimpleFight* CTasksSA::CreateTaskSimpleFight(CEntity* pTargetEntity, int nCommand, unsigned int nIdlePeriod)
 {
-    DEBUG_TRACE("CTaskSimpleFight* CTasksSA::CreateTaskSimpleFight ( CEntity *pTargetEntity, int nCommand, unsigned int nIdlePeriod )");
-
     CTaskSimpleFightSA* pTask = NewTask<CTaskSimpleFightSA>(pTargetEntity, nCommand, nIdlePeriod);
     m_pTaskManagementSystem->AddTask(pTask);
     return pTask;
diff --git a/Client/game_sa/CTrailerSA.cpp b/Client/game_sa/CTrailerSA.cpp
index 06f94e75586..ec8b3429c71 100644
--- a/Client/game_sa/CTrailerSA.cpp
+++ b/Client/game_sa/CTrailerSA.cpp
@@ -14,11 +14,9 @@
 
 CTrailerSA::CTrailerSA(CTrailerSAInterface* trailer) : CAutomobileSA(trailer)
 {
-    DEBUG_TRACE("CTrailerSA::CTrailerSA( CTrailerSAInterface * trailer )");
     this->m_pInterface = trailer;
 }
 
 CTrailerSA::CTrailerSA(eVehicleTypes dwModelID, unsigned char ucVariation, unsigned char ucVariation2) : CAutomobileSA(dwModelID, ucVariation, ucVariation2)
 {
-    DEBUG_TRACE("CTrailerSA::CTrailerSA( eVehicleTypes dwModelID ):CVehicleSA( dwModelID )");
 }
diff --git a/Client/game_sa/CVehicleSA.cpp b/Client/game_sa/CVehicleSA.cpp
index 4e26ca0f4ee..273dce32b98 100644
--- a/Client/game_sa/CVehicleSA.cpp
+++ b/Client/game_sa/CVehicleSA.cpp
@@ -123,7 +123,6 @@ CVehicleSA::CVehicleSA() : m_ucAlpha(255), m_bIsDerailable(true), m_vecGravity(0
 CVehicleSA::CVehicleSA(eVehicleTypes dwModelID, unsigned char ucVariation, unsigned char ucVariation2)
     : m_ucAlpha(255), m_bIsDerailable(true), m_vecGravity(0.0f, 0.0f, -1.0f), m_HeadLightColor(SharedUtil::SColorRGBA(255, 255, 255, 255))
 {
-    DEBUG_TRACE("CVehicleSA::CVehicleSA( eVehicleTypes dwModelID )");
     // for SA, we can just call the following function and it should just work:
     // CCarCtrl::CreateCarForScript(int,class CVector,unsigned char)
     //                              ModelID, Position, IsMissionVehicle
@@ -154,7 +153,7 @@ CVehicleSA::CVehicleSA(eVehicleTypes dwModelID, unsigned char ucVariation, unsig
 
     m_pInterface = reinterpret_cast<CEntitySAInterface*>(dwReturn);
 #if 0
-    this->BeingDeleted = FALSE;
+    this->BeingDeleted = false;
 
     m_pInterface->bStreamingDontDelete = true;
     m_pInterface->bDontStream = true;
@@ -202,7 +201,7 @@ CVehicleSA::CVehicleSA(CVehicleSAInterface* pVehicleInterface)
 #if 0
     m_pInterface->bStreamingDontDelete = true;
     m_pInterface->bDontStream = true;
-    this->BeingDeleted = FALSE;
+    this->BeingDeleted = false;
 
     // Store our CVehicleSA pointer in the vehicle's time of creation member (as it won't get modified later and as far as I know it isn't used for something important)
     GetVehicleInterface ()->m_pVehicle = this;
@@ -227,7 +226,7 @@ void CVehicleSA::Init()
 {
     m_pInterface->bStreamingDontDelete = true;
     m_pInterface->bDontStream = true;
-    this->BeingDeleted = FALSE;
+    this->BeingDeleted = false;
 
     // Store our CVehicleSA pointer in the vehicle's time of creation member (as it won't get modified later and as far as I know it isn't used for something
     // important)
@@ -318,10 +317,8 @@ void CVehicleSA::Init()
     FinalizeFramesList();
 }
 
-// DESTRUCTOR
 CVehicleSA::~CVehicleSA()
 {
-    DEBUG_TRACE("CVehicleSA::~CVehicleSA()");
     if (!this->BeingDeleted)
     {
         if ((DWORD)m_pInterface->vtbl != VTBL_CPlaceable)
@@ -748,7 +745,6 @@ void CVehicleSA::LockDoors(bool bLocked)
 
 void CVehicleSA::AddVehicleUpgrade(DWORD dwModelID)
 {
-    DEBUG_TRACE("void CVehicleSA::AddVehicleUpgrade ( DWORD dwModelID )");
     if (dwModelID >= 1000 && dwModelID <= 1193)
     {
         DWORD dwThis = (DWORD)m_pInterface;
@@ -765,7 +761,6 @@ void CVehicleSA::AddVehicleUpgrade(DWORD dwModelID)
 
 void CVehicleSA::RemoveVehicleUpgrade(DWORD dwModelID)
 {
-    DEBUG_TRACE("void CVehicleSA::RemoveVehicleUpgrade ( DWORD dwModelID )");
     DWORD dwThis = (DWORD)m_pInterface;
     DWORD dwFunc = FUNC_CVehicle_RemoveVehicleUpgrade;
 
@@ -791,7 +786,6 @@ bool CVehicleSA::DoesSupportUpgrade(const SString& strFrameName)
 
 DWORD CVehicleSA::GetBaseVehicleType()
 {
-    DEBUG_TRACE("DWORD CVehicleSA::GetBaseVehicleType ( void )");
     DWORD dwThis = (DWORD)m_pInterface;
     DWORD dwFunc = FUNC_CVehicle_GetBaseVehicleType;
     DWORD dwReturn = 0;
@@ -809,31 +803,26 @@ DWORD CVehicleSA::GetBaseVehicleType()
 
 void CVehicleSA::SetBodyDirtLevel(float fDirtLevel)
 {
-    DEBUG_TRACE("void CVehicleSA::SetBodyDirtLevel ( float fDirtLevel )");
     GetVehicleInterface()->nBodyDirtLevel = fDirtLevel;
 }
 
 float CVehicleSA::GetBodyDirtLevel()
 {
-    DEBUG_TRACE("float CVehicleSA::GetBodyDirtLevel ( void )");
     return GetVehicleInterface()->nBodyDirtLevel;
 }
 
 unsigned char CVehicleSA::GetCurrentGear()
 {
-    DEBUG_TRACE("unsigned char CVehicleSA::GetCurrentGear ( void )");
     return GetVehicleInterface()->m_nCurrentGear;
 }
 
 float CVehicleSA::GetGasPedal()
 {
-    DEBUG_TRACE("float CVehicleSA::GetGasPedal ( void )");
     return GetVehicleInterface()->m_fGasPedal;
 }
 
 bool CVehicleSA::GetTowBarPos(CVector* pVector, CVehicle* pTrailer)
 {
-    DEBUG_TRACE("bool CVehicleSA::GetTowBarPos ( CVector* pVector )");
     CVehicleSAInterfaceVTBL* vehicleVTBL = (CVehicleSAInterfaceVTBL*)(m_pInterface->vtbl);
     DWORD                    dwThis = (DWORD)m_pInterface;
     DWORD                    dwFunc = vehicleVTBL->GetTowbarPos;
@@ -859,7 +848,6 @@ bool CVehicleSA::GetTowBarPos(CVector* pVector, CVehicle* pTrailer)
 
 bool CVehicleSA::GetTowHitchPos(CVector* pVector)
 {
-    DEBUG_TRACE("bool CVehicleSA::GetTowHitchPos ( CVector* pVector )");
     CVehicleSAInterfaceVTBL* vehicleVTBL = (CVehicleSAInterfaceVTBL*)(m_pInterface->vtbl);
     DWORD                    dwThis = (DWORD)m_pInterface;
     DWORD                    dwFunc = vehicleVTBL->GetTowHitchPos;
@@ -880,7 +868,6 @@ bool CVehicleSA::GetTowHitchPos(CVector* pVector)
 
 bool CVehicleSA::IsUpsideDown()
 {
-    DEBUG_TRACE("bool CVehicleSA::IsUpsideDown ( void )");
     DWORD dwThis = (DWORD)m_pInterface;
     DWORD dwFunc = FUNC_CVehicle_IsUpsideDown;
     bool  bReturn = false;
@@ -897,7 +884,6 @@ bool CVehicleSA::IsUpsideDown()
 
 void CVehicleSA::SetEngineOn(bool bEngineOn)
 {
-    DEBUG_TRACE("void CVehicleSA::SetEngineOn ( bool bEngineOn )");
     DWORD dwThis = (DWORD)m_pInterface;
     DWORD dwEngineOn = (DWORD)bEngineOn;
     DWORD dwFunc = FUNC_CVehicle_SetEngineOn;
@@ -912,7 +898,6 @@ void CVehicleSA::SetEngineOn(bool bEngineOn)
 
 CPed* CVehicleSA::GetDriver()
 {
-    DEBUG_TRACE("CPed* CVehicleSA::GetDriver ( void )");
     CPoolsSA* pPools = (CPoolsSA*)pGame->GetPools();
 
     CPedSAInterface* pDriver = GetVehicleInterface()->pDriver;
@@ -929,7 +914,6 @@ CPed* CVehicleSA::GetDriver()
 
 CPed* CVehicleSA::GetPassenger(unsigned char ucSlot)
 {
-    DEBUG_TRACE("CPed* CVehicleSA::GetPassenger ( unsigned char ucSlot )");
     CPoolsSA* pPools = (CPoolsSA*)pGame->GetPools();
 
     if (ucSlot < 8)
@@ -950,12 +934,7 @@ CPed* CVehicleSA::GetPassenger(unsigned char ucSlot)
 
 bool CVehicleSA::IsBeingDriven()
 {
-    DEBUG_TRACE("bool CVehicleSA::IsBeingDriven()");
-    CVehicleSAInterface* vehicle = (CVehicleSAInterface*)this->GetInterface();
-    if (GetVehicleInterface()->pDriver != NULL)
-        return TRUE;
-    else
-        return FALSE;
+    return GetVehicleInterface()->pDriver != NULL;
 }
 
 /**
@@ -963,7 +942,6 @@ bool CVehicleSA::IsBeingDriven()
  */
 void CVehicleSA::PlaceBikeOnRoadProperly()
 {
-    DEBUG_TRACE("void CVehicleSA::PlaceBikeOnRoadProperly()");
     DWORD dwFunc = FUNC_Bike_PlaceOnRoadProperly;
     DWORD dwBike = (DWORD)this->GetInterface();
 
@@ -976,7 +954,6 @@ void CVehicleSA::PlaceBikeOnRoadProperly()
 
 void CVehicleSA::PlaceAutomobileOnRoadProperly()
 {
-    DEBUG_TRACE("void CVehicleSA::PlaceAutomobileOnRoadProperly()");
     DWORD dwFunc = FUNC_Automobile_PlaceOnRoadProperly;
     DWORD dwAutomobile = (DWORD)this->GetInterface();
 
@@ -1032,7 +1009,6 @@ void CVehicleSA::GetColor(SharedUtil::SColor* color1, SharedUtil::SColor* color2
 // works with firetrucks & tanks
 void CVehicleSA::GetTurretRotation(float* fHorizontal, float* fVertical)
 {
-    DEBUG_TRACE("void * CVehicleSA::GetTurretRotation ( float * fHorizontal, float * fVertical )");
     // This is coded in asm because for some reason it was failing to compile
     // correctly with normal c++.
     DWORD vehicleInterface = (DWORD)this->GetInterface();
@@ -1054,7 +1030,6 @@ void CVehicleSA::GetTurretRotation(float* fHorizontal, float* fVertical)
 
 void CVehicleSA::SetTurretRotation(float fHorizontal, float fVertical)
 {
-    DEBUG_TRACE("void * CVehicleSA::SetTurretRotation ( float fHorizontal, float fVertical )");
     //*(float *)(this->GetInterface() + 2380) = fHorizontal;
     //*(float *)(this->GetInterface() + 2384) = fVertical;
     DWORD vehicleInterface = (DWORD)this->GetInterface();
@@ -1150,7 +1125,6 @@ bool CVehicleSA::IsLandingGearDown()
 
 void CVehicleSA::Fix()
 {
-    DEBUG_TRACE("void CVehicleSA::Fix ( void )");
     DWORD dwThis = (DWORD)GetInterface();
 
     DWORD       dwFunc = 0;
@@ -1179,7 +1153,6 @@ void CVehicleSA::Fix()
 
 CDamageManager* CVehicleSA::GetDamageManager()
 {
-    DEBUG_TRACE("CDamageManager * CVehicleSA::GetDamageManager()");
     return this->m_pDamageManager;
 }
 
@@ -1215,7 +1188,6 @@ bool CVehicleSA::IsFadingOut()
 
 void CVehicleSA::SetTowLink(CVehicle* pVehicle)
 {
-    DEBUG_TRACE("void CVehicleSA::SetTowLink ( CVehicle* pVehicle )");
     // We can't use the vtable func, because it teleports the trailer parallel to the vehicle => make our own one (see #1655)
 
     CVehicleSA* towingVehicleSA = dynamic_cast<CVehicleSA*>(pVehicle);
@@ -1234,7 +1206,6 @@ void CVehicleSA::SetTowLink(CVehicle* pVehicle)
 
 bool CVehicleSA::BreakTowLink()
 {
-    DEBUG_TRACE("bool CVehicleSA::BreakTowLink ( void )");
     DWORD dwThis = (DWORD)GetInterface();
 
     CVehicleSAInterfaceVTBL* vehicleVTBL = (CVehicleSAInterfaceVTBL*)(GetInterface()->vtbl);
@@ -1253,7 +1224,6 @@ bool CVehicleSA::BreakTowLink()
 
 CVehicle* CVehicleSA::GetTowedVehicle()
 {
-    DEBUG_TRACE("CVehicle * CVehicleSA::GetTowedVehicle ( void )");
     CVehicleSAInterface* trailerVehicle = GetVehicleInterface()->m_trailerVehicle;
 
     if (trailerVehicle)
@@ -1267,7 +1237,6 @@ CVehicle* CVehicleSA::GetTowedVehicle()
 
 CVehicle* CVehicleSA::GetTowedByVehicle()
 {
-    DEBUG_TRACE("CVehicle * CVehicleSA::GetTowedVehicle ( void )");
     CVehicleSAInterface* towingVehicle = GetVehicleInterface()->m_towingVehicle;
 
     if (towingVehicle)
@@ -1549,7 +1518,6 @@ int CVehicleSA::GetWheelFrictionState(BYTE eWheelPosition)
 
 void CVehicleSA::SetTaxiLightOn(bool bLightOn)
 {
-    DEBUG_TRACE("void CVehicleSA::SetTaxiLight ( bool bLightOn )");
     DWORD dwThis = (DWORD)GetInterface();
     DWORD dwState = (DWORD)bLightOn;
     DWORD dwFunc = FUNC_CAutomobile_SetTaxiLight;
diff --git a/Client/game_sa/CWeaponInfoSA.h b/Client/game_sa/CWeaponInfoSA.h
index d6dc88b4d21..8119beb034e 100644
--- a/Client/game_sa/CWeaponInfoSA.h
+++ b/Client/game_sa/CWeaponInfoSA.h
@@ -13,7 +13,6 @@
 
 #include <game/CWeaponInfo.h>
 #include <CVector.h>
-#include "Common.h"
 
 // Flame shot array for flamethrower flames and maybe molotovs
 #define ARRAY_CFlameShotInfo                0xC89690
@@ -96,7 +95,6 @@ class CWeaponInfoSA : public CWeaponInfo
     CWeaponInfoSAInterface* internalInterface;
 
 public:
-    // constructor
     CWeaponInfoSA(CWeaponInfoSAInterface* weaponInfoInterface, eWeaponType weaponType)
     {
         internalInterface = weaponInfoInterface;
diff --git a/Client/game_sa/CWeaponSA.cpp b/Client/game_sa/CWeaponSA.cpp
index b1b6e00884e..20754a83597 100644
--- a/Client/game_sa/CWeaponSA.cpp
+++ b/Client/game_sa/CWeaponSA.cpp
@@ -19,7 +19,6 @@
 
 CWeaponSA::CWeaponSA(CWeaponSAInterface* weaponInterface, CPed* ped, eWeaponSlot weaponSlot)
 {
-    DEBUG_TRACE("CWeaponSA::CWeaponSA( CWeaponSAInterface * weaponInterface, CPed * ped, DWORD dwSlot )");
     this->owner = ped;
     this->m_weaponSlot = weaponSlot;
     internalInterface = weaponInterface;
@@ -36,67 +35,56 @@ void CWeaponSA::Destroy()
 
 eWeaponType CWeaponSA::GetType()
 {
-    DEBUG_TRACE("eWeaponType CWeaponSA::GetType(  )");
     return this->internalInterface->m_eWeaponType;
 };
 
 void CWeaponSA::SetType(eWeaponType type)
 {
-    DEBUG_TRACE("VOID CWeaponSA::SetType( eWeaponType type )");
     this->internalInterface->m_eWeaponType = type;
 }
 
 eWeaponState CWeaponSA::GetState()
 {
-    DEBUG_TRACE("eWeaponState CWeaponSA::GetState(  )");
     return this->internalInterface->m_eState;
 }
 
 void CWeaponSA::SetState(eWeaponState state)
 {
-    DEBUG_TRACE("void CWeaponSA::SetState ( eWeaponState state )");
     this->internalInterface->m_eState = state;
 }
 
 DWORD CWeaponSA::GetAmmoInClip()
 {
-    DEBUG_TRACE("DWORD CWeaponSA::GetAmmoInClip(  )");
     return this->internalInterface->m_nAmmoInClip;
 }
 
 void CWeaponSA::SetAmmoInClip(DWORD dwAmmoInClip)
 {
-    DEBUG_TRACE("VOID CWeaponSA::SetAmmoInClip( DWORD dwAmmoInClip )");
     this->internalInterface->m_nAmmoInClip = dwAmmoInClip;
 }
 
 DWORD CWeaponSA::GetAmmoTotal()
 {
-    DEBUG_TRACE("DWORD CWeaponSA::GetAmmoTotal(  )");
     return this->internalInterface->m_nAmmoTotal;
 }
 
 void CWeaponSA::SetAmmoTotal(DWORD dwAmmoTotal)
 {
-    DEBUG_TRACE("VOID CWeaponSA::SetAmmoTotal( DWORD dwAmmoTotal )");
     this->internalInterface->m_nAmmoTotal = dwAmmoTotal;
 }
 
 CPed* CWeaponSA::GetPed()
 {
-    DEBUG_TRACE("CPed * CWeaponSA::GetPed()");
     return (CPed*)owner;
 }
 
 eWeaponSlot CWeaponSA::GetSlot()
 {
-    DEBUG_TRACE("eWeaponSlot CWeaponSA::GetSlot()");
     return m_weaponSlot;
 }
 
 void CWeaponSA::SetAsCurrentWeapon()
 {
-    DEBUG_TRACE("VOID CWeaponSA::SetAsCurrentWeapon()");
     owner->SetCurrentWeaponSlot(m_weaponSlot);
 }
 
@@ -107,7 +95,6 @@ CWeaponInfo* CWeaponSA::GetInfo(eWeaponSkill skill)
 
 void CWeaponSA::Remove()
 {
-    DEBUG_TRACE("void CWeaponSA::Remove ()");
     DWORD dwFunc = FUNC_Shutdown;
     DWORD dwThis = (DWORD)this->internalInterface;
     _asm
diff --git a/Client/game_sa/CWeatherSA.cpp b/Client/game_sa/CWeatherSA.cpp
index 9e126a3d377..936734f69f6 100644
--- a/Client/game_sa/CWeatherSA.cpp
+++ b/Client/game_sa/CWeatherSA.cpp
@@ -21,26 +21,22 @@ unsigned long CWeatherSA::FUNC_IsRaining;
 
 unsigned char CWeatherSA::Get()
 {
-    DEBUG_TRACE("unsigned char CWeatherSA::Get ( void )");
     return (unsigned char)*VAR_CWeather__ForcedWeatherType;
 }
 
 void CWeatherSA::Set(unsigned char primary, unsigned char secondary)
 {
-    DEBUG_TRACE("void CWeatherSA::Set ( unsigned char primary, unsigned char secondary )");
     *VAR_CWeather__OldWeatherType = static_cast<unsigned char>(primary);
     *VAR_CWeather__NewWeatherType = static_cast<unsigned char>(secondary);
 }
 
 void CWeatherSA::Release()
 {
-    DEBUG_TRACE("void CWeatherSA::Release ( void )");
     *VAR_CWeather__ForcedWeatherType = 0xFF;
 }
 
 bool CWeatherSA::IsRaining()
 {
-    DEBUG_TRACE("bool CWeatherSA::IsRaining ( void )");
     DWORD dwFunc = FUNC_IsRaining;
     bool  bReturn = false;
     _asm
diff --git a/Client/game_sa/CWorldSA.cpp b/Client/game_sa/CWorldSA.cpp
index 027d578baa4..3c139f80fe5 100644
--- a/Client/game_sa/CWorldSA.cpp
+++ b/Client/game_sa/CWorldSA.cpp
@@ -128,8 +128,6 @@ void _declspec(naked) HOOK_FallenCars()
 
 void CWorldSA::Add(CEntity* pEntity, eDebugCaller CallerId)
 {
-    DEBUG_TRACE("VOID CWorldSA::Add ( CEntity * pEntity )");
-
     CEntitySA* pEntitySA = dynamic_cast<CEntitySA*>(pEntity);
 
     if (pEntitySA)
@@ -153,7 +151,6 @@ void CWorldSA::Add(CEntity* pEntity, eDebugCaller CallerId)
 
 void CWorldSA::Add(CEntitySAInterface* entityInterface, eDebugCaller CallerId)
 {
-    DEBUG_TRACE("VOID CWorldSA::Add ( CEntitySAInterface * entityInterface )");
     DWORD dwFunction = FUNC_Add;
     if ((DWORD)entityInterface->vtbl == VTBL_CPlaceable)
     {
@@ -170,8 +167,6 @@ void CWorldSA::Add(CEntitySAInterface* entityInterface, eDebugCaller CallerId)
 
 void CWorldSA::Remove(CEntity* pEntity, eDebugCaller CallerId)
 {
-    DEBUG_TRACE("VOID CWorldSA::Remove ( CEntity * entity )");
-
     CEntitySA* pEntitySA = dynamic_cast<CEntitySA*>(pEntity);
 
     if (pEntitySA)
@@ -195,7 +190,6 @@ void CWorldSA::Remove(CEntity* pEntity, eDebugCaller CallerId)
 
 void CWorldSA::Remove(CEntitySAInterface* entityInterface, eDebugCaller CallerId)
 {
-    DEBUG_TRACE("VOID CWorldSA::Remove ( CEntitySAInterface * entityInterface )");
     if ((DWORD)entityInterface->vtbl == VTBL_CPlaceable)
     {
         SString strMessage("Caller: %i ", CallerId);
@@ -254,7 +248,6 @@ void ConvertMatrixToEulerAngles(const CMatrix_Padded& matrixPadded, float& fX, f
 bool CWorldSA::ProcessLineOfSight(const CVector* vecStart, const CVector* vecEnd, CColPoint** colCollision, CEntity** CollisionEntity,
                                   const SLineOfSightFlags flags, SLineOfSightBuildingResult* pBuildingResult)
 {
-    DEBUG_TRACE("VOID CWorldSA::ProcessLineOfSight(CVector * vecStart, CVector * vecEnd, CColPoint * colCollision, CEntity * CollisionEntity)");
     DWORD dwPadding[100];            // stops the function missbehaving and overwriting the return address
     dwPadding[0] = 0;                // prevent the warning and eventual compiler optimizations from removing it
 
@@ -361,8 +354,6 @@ bool CWorldSA::ProcessLineOfSight(const CVector* vecStart, const CVector* vecEnd
 
 void CWorldSA::IgnoreEntity(CEntity* pEntity)
 {
-    DEBUG_TRACE("VOID CWorldSA::IgnoreEntity(CEntity * entity)");
-
     CEntitySA* pEntitySA = dynamic_cast<CEntitySA*>(pEntity);
 
     if (pEntitySA)
@@ -373,7 +364,6 @@ void CWorldSA::IgnoreEntity(CEntity* pEntity)
 
 float CWorldSA::FindGroundZFor3DPosition(CVector* vecPosition)
 {
-    DEBUG_TRACE("FLOAT CWorldSA::FindGroundZFor3DPosition(CVector * vecPosition)");
     DWORD dwFunc = FUNC_FindGroundZFor3DCoord;
     float fReturn = 0;
     float fX = vecPosition->fX;
@@ -395,8 +385,6 @@ float CWorldSA::FindGroundZFor3DPosition(CVector* vecPosition)
 
 float CWorldSA::FindRoofZFor3DCoord(CVector* pvecPosition, bool* pbOutResult)
 {
-    DEBUG_TRACE("FLOAT CWorldSA::FindRoofZFor3DCoord(float x, float y, float z, bool * pbOutResult)");
-
     auto CWorld_FindRoofZFor3DCoord = (float(__cdecl*)(float, float, float, bool*))0x569750;
     return CWorld_FindRoofZFor3DCoord(pvecPosition->fX, pvecPosition->fY, pvecPosition->fZ, pbOutResult);
 }
diff --git a/Client/game_sa/Common.h b/Client/game_sa/Common.h
deleted file mode 100644
index 126c22b1797..00000000000
--- a/Client/game_sa/Common.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*****************************************************************************
- *
- *  PROJECT:     Multi Theft Auto v1.0
- *  LICENSE:     See LICENSE in the top level directory
- *  FILE:        game_sa/Common.h
- *  PURPOSE:     Common game layer include file
- *
- *  Multi Theft Auto is available from http://www.multitheftauto.com/
- *
- *****************************************************************************/
-
-#pragma once
-
-#include <game/Common.h>
-
-#undef DEBUG_LOG
-#ifdef DEBUG_LOG
-    #include <stdio.h>
-    #include <time.h>
-
-static FILE* fDebugFile;
-
-static void OutputDebugText(char* szDebugText)
-{
-        #ifdef MTA_DEBUG
-    char szDebug[500];
-    sprintf(szDebug, "%s\n", szDebugText);
-    OutputDebugString(szDebug);
-        #endif
-}
-
-    #ifdef MTA_DEBUG
-        #define DEBUG_TRACE(szText) \
-            OutputDebugString(szText);
-    #endif
-#else
-    #define DEBUG_TRACE(szText) // we do nothing with release versions
-#endif
diff --git a/Client/game_sa/HookSystem.h b/Client/game_sa/HookSystem.h
index f94fc7c46bf..16075e39e49 100644
--- a/Client/game_sa/HookSystem.h
+++ b/Client/game_sa/HookSystem.h
@@ -25,18 +25,18 @@ void* FunctionPointerToVoidP(T func)
 }
 
 template <typename T>
-BOOL HookInstall(DWORD dwInstallAddress, T dwHookHandler, int iJmpCodeSize = 5)
+bool HookInstall(DWORD dwInstallAddress, T dwHookHandler, int iJmpCodeSize = 5)
 {
     BYTE JumpBytes[MAX_JUMPCODE_SIZE];
     MemSetFast(JumpBytes, 0x90, MAX_JUMPCODE_SIZE);
     if (CreateJump(dwInstallAddress, (DWORD)FunctionPointerToVoidP(dwHookHandler), JumpBytes))
     {
         MemCpy((PVOID)dwInstallAddress, JumpBytes, iJmpCodeSize);
-        return TRUE;
+        return true;
     }
     else
     {
-        return FALSE;
+        return false;
     }
 }
 
diff --git a/Client/game_sa/StdInc.h b/Client/game_sa/StdInc.h
index e0a296cd183..d961eec57a6 100644
--- a/Client/game_sa/StdInc.h
+++ b/Client/game_sa/StdInc.h
@@ -1,6 +1,12 @@
 
 // Pragmas
+
+// illegal instruction size
+// The instruction did not have a form with the specified size. The smallest legal size was used.
 #pragma warning (disable:4409)
+
+// 'class1' : inherits 'class2::member' via dominance
+// Two or more members have the same name. The one in class2 is inherited because it is a base class for the other classes that contained this member.
 #pragma warning (disable:4250)
 
 #include <windows.h>
@@ -26,5 +32,4 @@
 
 // Game includes
 #include "HookSystem.h"
-#include "Common.h"
 #include "gamesa_init.h"
diff --git a/Client/game_sa/TaskAttackSA.cpp b/Client/game_sa/TaskAttackSA.cpp
index 8ad254e5362..0a03a111ffd 100644
--- a/Client/game_sa/TaskAttackSA.cpp
+++ b/Client/game_sa/TaskAttackSA.cpp
@@ -17,10 +17,6 @@
 CTaskSimpleGangDriveBySA::CTaskSimpleGangDriveBySA(CEntity* pTargetEntity, const CVector* pVecTarget, float fAbortRange, char FrequencyPercentage,
                                                    char nDrivebyStyle, bool bSeatRHS)
 {
-    DEBUG_TRACE(
-        "CTaskSimpleGangDriveBySA::CTaskSimpleGangDriveBySA ( CEntity *pTargetEntity, const CVector *pVecTarget, float fAbortRange, char FrequencyPercentage, "
-        "char nDrivebyStyle, bool bSeatRHS )");
-
     this->CreateTaskInterface(sizeof(CTaskSimpleGangDriveBySAInterface));
     if (!IsValid())
         return;
@@ -42,10 +38,6 @@ CTaskSimpleGangDriveBySA::CTaskSimpleGangDriveBySA(CEntity* pTargetEntity, const
 
 CTaskSimpleUseGunSA::CTaskSimpleUseGunSA(CEntity* pTargetEntity, CVector vecTarget, char nCommand, short nBurstLength, unsigned char bAimImmediate)
 {
-    DEBUG_TRACE(
-        "CTaskSimpleUseGunSA::CTaskSimpleUseGunSA ( CEntity *pTargetEntity, CVector vecTarget, char nCommand, short nBurstLength, unsigned char bAimImmediate "
-        ")");
-
     this->CreateTaskInterface(sizeof(CTaskSimpleUseGunSAInterface));
     if (!IsValid())
         return;
@@ -445,8 +437,6 @@ void CTaskSimpleUseGunSA::StartCountDown(unsigned char a, bool b)
 
 CTaskSimpleFightSA::CTaskSimpleFightSA(CEntity* pTargetEntity, int nCommand, unsigned int nIdlePeriod)
 {
-    DEBUG_TRACE("CTaskSimpleFightSA::CTaskSimpleFightSA ( CEntity *pTargetEntity, int nCommand, unsigned int nIdlePeriod )");
-
     this->CreateTaskInterface(sizeof(CTaskSimpleFightSAInterface));
     if (!IsValid())
         return;
diff --git a/Client/game_sa/TaskBasicSA.cpp b/Client/game_sa/TaskBasicSA.cpp
index 52eddaa3019..27bb895c67f 100644
--- a/Client/game_sa/TaskBasicSA.cpp
+++ b/Client/game_sa/TaskBasicSA.cpp
@@ -15,8 +15,6 @@
 
 CTaskComplexUseMobilePhoneSA::CTaskComplexUseMobilePhoneSA(const int iDuration)
 {
-    DEBUG_TRACE("CTaskComplexUseMobilePhoneSA::CTaskComplexUseMobilePhoneSA(const int iDuration)");
-
     this->CreateTaskInterface(sizeof(CTaskComplexUseMobilePhoneSAInterface));
     if (!IsValid())
         return;
@@ -34,10 +32,6 @@ CTaskComplexUseMobilePhoneSA::CTaskComplexUseMobilePhoneSA(const int iDuration)
 CTaskSimpleRunAnimSA::CTaskSimpleRunAnimSA(const AssocGroupId animGroup, const AnimationId animID, const float fBlendDelta, const int iTaskType,
                                            const char* pTaskName, const bool bHoldLastFrame)
 {
-    DEBUG_TRACE(
-        "CTaskSimpleRunAnim::CTaskSimpleRunAnim (  const AssocGroupId animGroup, const AnimationId animID, const float fBlendDelta, const int iTaskType, const "
-        "char* pTaskName, const bool bHoldLastFrame );");
-
     // TODO: Find out the real size
     this->CreateTaskInterface(1024);
     if (!IsValid())
@@ -62,11 +56,6 @@ CTaskSimpleRunNamedAnimSA::CTaskSimpleRunNamedAnimSA(const char* pAnimName, cons
                                                      const int iTime, const bool bDontInterrupt, const bool bRunInSequence, const bool bOffsetPed,
                                                      const bool bHoldLastFrame)
 {
-    DEBUG_TRACE(
-        "CTaskSimpleRunNamedAnimSA::CTaskSimpleRunNamedAnimSA (  const char* pAnimName, const char* pAnimGroupName, const int flags, const float fBlendDelta, "
-        "const int iTime = -1, const bool bDontInterrupt = false, const bool bRunInSequence = false, const bool bOffsetPed = false, const bool bHoldLastFrame "
-        "= false )");
-
     // TODO: Find out the real size
     this->CreateTaskInterface(sizeof(CTaskSimpleRunNamedAnimSAInterface));
     if (!IsValid())
@@ -94,11 +83,6 @@ CTaskComplexDieSA::CTaskComplexDieSA(const eWeaponType eMeansOfDeath, const Asso
                                      const float fAnimSpeed, const bool bBeingKilledByStealth, const bool bFallingToDeath, const int iFallToDeathDir,
                                      const bool bFallToDeathOverRailing)
 {
-    DEBUG_TRACE(
-        "CTaskComplexDieSA::CTaskComplexDieSA ( const eWeaponType eMeansOfDeath, const AssocGroupId animGroup, const AnimationId anim, const float "
-        "fBlendDelta, const float fAnimSpeed, const bool bBeingKilledByStealth, const bool bFallingToDeath, const int iFallToDeathDir, const bool "
-        "bFallToDeathOverRailing )");
-
     // TODO: Find out the real size
     this->CreateTaskInterface(1024);
     if (!IsValid())
@@ -124,8 +108,6 @@ CTaskComplexDieSA::CTaskComplexDieSA(const eWeaponType eMeansOfDeath, const Asso
 
 CTaskSimpleStealthKillSA::CTaskSimpleStealthKillSA(bool bKiller, CPed* pPed, const AssocGroupId animGroup)
 {
-    DEBUG_TRACE("CTaskSimpleStealthKillSA::CTaskSimpleStealthKillSA ( bool bKiller, class CPed * pPed, const AssocGroupId animGroup )");
-
     // TODO: Find out the real size
     this->CreateTaskInterface(1024);
     if (!IsValid())
@@ -146,8 +128,6 @@ CTaskSimpleStealthKillSA::CTaskSimpleStealthKillSA(bool bKiller, CPed* pPed, con
 
 CTaskSimpleDeadSA::CTaskSimpleDeadSA(unsigned int uiDeathTimeMS, bool bUnk2)
 {
-    DEBUG_TRACE("CTaskSimpleDeadSA::CTaskSimpleDeadSA ( int iUnk1, bool bUnk2 )");
-
     this->CreateTaskInterface(sizeof(CTaskSimpleDeadSAInterface));
     if (!IsValid())
         return;
@@ -165,8 +145,6 @@ CTaskSimpleDeadSA::CTaskSimpleDeadSA(unsigned int uiDeathTimeMS, bool bUnk2)
 
 CTaskSimpleBeHitSA::CTaskSimpleBeHitSA(CPed* pPedAttacker, ePedPieceTypes hitBodyPart, int hitBodySide, int weaponId)
 {
-    DEBUG_TRACE("CTaskSimpleBeHitSA::CTaskSimpleBeHitSA ( CPed* pPedAttacker, ePedPieceTypes hitBodyPart, int hitBodySide, int weaponId )");
-
     this->CreateTaskInterface(sizeof(CTaskSimpleBeHitSAInterface));
     if (!IsValid())
         return;
@@ -187,8 +165,6 @@ CTaskSimpleBeHitSA::CTaskSimpleBeHitSA(CPed* pPedAttacker, ePedPieceTypes hitBod
 
 CTaskComplexSunbatheSA::CTaskComplexSunbatheSA(CObject* pTowel, const bool bStartStanding)
 {
-    DEBUG_TRACE("CTaskComplexSunbatheSA::CTaskComplexSunbatheSA ( CObject* pTowel, const bool bStartStanding )");
-
     // TODO: Find out the real size
     this->CreateTaskInterface(1024);
     if (!IsValid())
@@ -219,7 +195,6 @@ void CTaskComplexSunbatheSA::SetEndTime(DWORD dwTime)
 ////////////////////
 CTaskSimplePlayerOnFootSA::CTaskSimplePlayerOnFootSA()
 {
-    DEBUG_TRACE("CTaskSimplePlayerOnFootSA::CTaskSimplePlayerOnFootSA");
     this->CreateTaskInterface(sizeof(CTaskSimplePlayerOnFootSAInterface));
     if (!IsValid())
         return;
@@ -238,7 +213,6 @@ CTaskSimplePlayerOnFootSA::CTaskSimplePlayerOnFootSA()
 ////////////////////
 CTaskComplexFacialSA::CTaskComplexFacialSA()
 {
-    DEBUG_TRACE("CTaskComplexFacialSA::CTaskComplexFacialSA");
     this->CreateTaskInterface(sizeof(CTaskComplexFacialSAInterface));
     if (!IsValid())
         return;
diff --git a/Client/game_sa/TaskCarAccessoriesSA.cpp b/Client/game_sa/TaskCarAccessoriesSA.cpp
index 058cf19ab3c..9fda5604f4d 100644
--- a/Client/game_sa/TaskCarAccessoriesSA.cpp
+++ b/Client/game_sa/TaskCarAccessoriesSA.cpp
@@ -19,8 +19,6 @@
 
 CTaskSimpleCarSetPedInAsDriverSA::CTaskSimpleCarSetPedInAsDriverSA(CVehicle* pTargetVehicle, CTaskUtilityLineUpPedWithCar* pUtility)
 {
-    DEBUG_TRACE("CTaskSimpleCarSetPedInAsDriverSA::CTaskSimpleCarSetPedInAsDriverSA(CVehicle* pTargetVehicle, CTaskUtilityLineUpPedWithCar* pUtility)");
-
     CVehicleSA* pTargetVehicleSA = dynamic_cast<CVehicleSA*>(pTargetVehicle);
 
     if (pTargetVehicleSA)
@@ -40,27 +38,20 @@ CTaskSimpleCarSetPedInAsDriverSA::CTaskSimpleCarSetPedInAsDriverSA(CVehicle* pTa
             call    dwFunc
         }
     }
-    else
-    {
-        DEBUG_TRACE("pTargetVehicleSA was invalid!");
-    }
 }
 
 void CTaskSimpleCarSetPedInAsDriverSA::SetIsWarpingPedIntoCar()
 {
-    DEBUG_TRACE("void CTaskSimpleCarSetPedInAsDriverSA::SetIsWarpingPedIntoCar()");
     ((CTaskSimpleCarSetPedInAsDriverSAInterface*)this->GetInterface())->m_bWarpingInToCar = true;
 }
 
 void CTaskSimpleCarSetPedInAsDriverSA::SetDoorFlagsToClear(const unsigned char nDoorFlagsToClear)
 {
-    DEBUG_TRACE("void CTaskSimpleCarSetPedInAsDriverSA::SetDoorFlagsToClear(const unsigned char nDoorFlagsToClear) ");
     ((CTaskSimpleCarSetPedInAsDriverSAInterface*)this->GetInterface())->m_nDoorFlagsToClear = nDoorFlagsToClear;
 }
 
 void CTaskSimpleCarSetPedInAsDriverSA::SetNumGettingInToClear(const unsigned char nNumGettingInToClear)
 {
-    DEBUG_TRACE("void CTaskSimpleCarSetPedInAsDriverSA::SetNumGettingInToClear(const unsigned char nNumGettingInToClear) ");
     ((CTaskSimpleCarSetPedInAsDriverSAInterface*)this->GetInterface())->m_nNumGettingInToClear = nNumGettingInToClear;
 }
 
@@ -71,10 +62,6 @@ void CTaskSimpleCarSetPedInAsDriverSA::SetNumGettingInToClear(const unsigned cha
 
 CTaskSimpleCarSetPedInAsPassengerSA::CTaskSimpleCarSetPedInAsPassengerSA(CVehicle* pTargetVehicle, int iTargetDoor, CTaskUtilityLineUpPedWithCar* pUtility)
 {
-    DEBUG_TRACE(
-        "CTaskSimpleCarSetPedInAsPassengerSA::CTaskSimpleCarSetPedInAsPassengerSA(CVehicle* pTargetVehicle, int iTargetDoor, CTaskUtilityLineUpPedWithCar* "
-        "pUtility)");
-
     CVehicleSA* pTargetVehicleSA = dynamic_cast<CVehicleSA*>(pTargetVehicle);
 
     if (pTargetVehicleSA)
@@ -94,27 +81,20 @@ CTaskSimpleCarSetPedInAsPassengerSA::CTaskSimpleCarSetPedInAsPassengerSA(CVehicl
             call    dwFunc
         }
     }
-    else
-    {
-        DEBUG_TRACE("pTargetVehicleSA was invalid!");
-    }
 }
 
 void CTaskSimpleCarSetPedInAsPassengerSA::SetIsWarpingPedIntoCar()
 {
-    DEBUG_TRACE("void CTaskSimpleCarSetPedInAsPassengerSA::SetIsWarpingPedIntoCar()");
     ((CTaskSimpleCarSetPedInAsPassengerSAInterface*)this->GetInterface())->m_bWarpingInToCar = true;
 }
 
 void CTaskSimpleCarSetPedInAsPassengerSA::SetDoorFlagsToClear(const unsigned char nDoorFlagsToClear)
 {
-    DEBUG_TRACE("void CTaskSimpleCarSetPedInAsPassengerSA::SetDoorFlagsToClear(const unsigned char nDoorFlagsToClear) ");
     ((CTaskSimpleCarSetPedInAsPassengerSAInterface*)this->GetInterface())->m_nDoorFlagsToClear = nDoorFlagsToClear;
 }
 
 void CTaskSimpleCarSetPedInAsPassengerSA::SetNumGettingInToClear(const unsigned char nNumGettingInToClear)
 {
-    DEBUG_TRACE("void CTaskSimpleCarSetPedInAsPassengerSA::SetNumGettingInToClear(const unsigned char nNumGettingInToClear) ");
     ((CTaskSimpleCarSetPedInAsPassengerSAInterface*)this->GetInterface())->m_nNumGettingInToClear = nNumGettingInToClear;
 }
 
@@ -125,8 +105,6 @@ void CTaskSimpleCarSetPedInAsPassengerSA::SetNumGettingInToClear(const unsigned
 
 CTaskSimpleCarSetPedOutSA::CTaskSimpleCarSetPedOutSA(CVehicle* pTargetVehicle, int iTargetDoor, bool bSwitchOffEngine)
 {
-    DEBUG_TRACE("CTaskSimpleCarSetPedOutSA::CTaskSimpleCarSetPedOutSA(CVehicle* pTargetVehicle, int iTargetDoor, bool bSwitchOffEngine)");
-
     CVehicleSA* pTargetVehicleSA = dynamic_cast<CVehicleSA*>(pTargetVehicle);
 
     if (pTargetVehicleSA)
@@ -148,40 +126,31 @@ CTaskSimpleCarSetPedOutSA::CTaskSimpleCarSetPedOutSA(CVehicle* pTargetVehicle, i
             call    dwFunc
         }
     }
-    else
-    {
-        DEBUG_TRACE("pTargetVehicleSA was invalid!");
-    }
 }
 
 void CTaskSimpleCarSetPedOutSA::SetIsWarpingPedOutOfCar()
 {
-    DEBUG_TRACE("void CTaskSimpleCarSetPedOutSA::SetIsWarpingPedOutOfCar()");
     ((CTaskSimpleCarSetPedOutSAInterface*)this->GetInterface())->m_bWarpingOutOfCar = true;
 }
 
 void CTaskSimpleCarSetPedOutSA::SetKnockedOffBike()
 {
-    DEBUG_TRACE("void CTaskSimpleCarSetPedOutSA::SetKnockedOffBike() ");
     ((CTaskSimpleCarSetPedOutSAInterface*)this->GetInterface())->m_bKnockedOffBike = true;
     ((CTaskSimpleCarSetPedOutSAInterface*)this->GetInterface())->m_bSwitchOffEngine = false;
 }
 
 void CTaskSimpleCarSetPedOutSA::SetDoorFlagsToClear(const unsigned char nDoorFlagsToClear)
 {
-    DEBUG_TRACE("void CTaskSimpleCarSetPedOutSA::SetDoorFlagsToClear(const unsigned char nDoorFlagsToClear) ");
     ((CTaskSimpleCarSetPedOutSAInterface*)this->GetInterface())->m_nDoorFlagsToClear = nDoorFlagsToClear;
 }
 
 void CTaskSimpleCarSetPedOutSA::SetNumGettingInToClear(const unsigned char nNumGettingInToClear)
 {
-    DEBUG_TRACE("void CTaskSimpleCarSetPedOutSA::SetNumGettingInToClear(const unsigned char nNumGettingInToClear) ");
     ((CTaskSimpleCarSetPedOutSAInterface*)this->GetInterface())->m_nNumGettingInToClear = nNumGettingInToClear;
 }
 
 void CTaskSimpleCarSetPedOutSA::PositionPedOutOfCollision(CPed* ped, CVehicle* vehicle, int nDoor)
 {
-    DEBUG_TRACE("void CTaskSimpleCarSetPedOutSA::PositionPedOutOfCollision(CPed * ped, CVehicle * vehicle, int nDoor)");
     DWORD dwFunc = FUNC_CTaskSimpleCarSetPedOut__PositionPedOutOfCollision;
     DWORD dwVehiclePtr = (DWORD)((CEntitySA*)vehicle)->GetInterface();
     DWORD dwPedPtr = (DWORD)((CEntitySA*)ped)->GetInterface();
diff --git a/Client/game_sa/TaskCarSA.cpp b/Client/game_sa/TaskCarSA.cpp
index e7044fcc30f..92df638569a 100644
--- a/Client/game_sa/TaskCarSA.cpp
+++ b/Client/game_sa/TaskCarSA.cpp
@@ -32,8 +32,6 @@ CTaskComplexEnterCarSA::CTaskComplexEnterCarSA(CVehicle* pTargetVehicle, const b
 
 CTaskComplexEnterCarAsDriverSA::CTaskComplexEnterCarAsDriverSA(CVehicle* pTargetVehicle) : CTaskComplexEnterCarSA(pTargetVehicle, true, false, false, false)
 {
-    DEBUG_TRACE("CTaskComplexEnterCarAsDriverSA::CTaskComplexEnterCarAsDriverSA(CVehicle* pTargetVehicle)");
-
     CVehicleSA* pTargetVehicleSA = dynamic_cast<CVehicleSA*>(pTargetVehicle);
 
     if (pTargetVehicleSA)
@@ -52,10 +50,6 @@ CTaskComplexEnterCarAsDriverSA::CTaskComplexEnterCarAsDriverSA(CVehicle* pTarget
             call    dwFunc
         }
     }
-    else
-    {
-        DEBUG_TRACE("pTargetVehicleSA was invalid!");
-    }
 }
 
 // ##############################################################################
@@ -66,8 +60,6 @@ CTaskComplexEnterCarAsDriverSA::CTaskComplexEnterCarAsDriverSA(CVehicle* pTarget
 CTaskComplexEnterCarAsPassengerSA::CTaskComplexEnterCarAsPassengerSA(CVehicle* pTargetVehicle, const int iTargetSeat, const bool bCarryOnAfterFallingOff)
     : CTaskComplexEnterCarSA(pTargetVehicle, false, false, false, false)
 {
-    DEBUG_TRACE("CTaskComplexEnterCarAsPassengerSA::CTaskComplexEnterCarAsPassengerSA(CVehicle* pTargetVehicle)");
-
     CVehicleSA* pTargetVehicleSA = dynamic_cast<CVehicleSA*>(pTargetVehicle);
 
     if (pTargetVehicleSA)
@@ -92,10 +84,6 @@ CTaskComplexEnterCarAsPassengerSA::CTaskComplexEnterCarAsPassengerSA(CVehicle* p
             pop     edx
         }
     }
-    else
-    {
-        DEBUG_TRACE("pTargetVehicleSA was invalid!");
-    }
 }
 
 // ##############################################################################
@@ -105,8 +93,6 @@ CTaskComplexEnterCarAsPassengerSA::CTaskComplexEnterCarAsPassengerSA(CVehicle* p
 
 CTaskComplexEnterBoatAsDriverSA::CTaskComplexEnterBoatAsDriverSA(CVehicle* pTargetVehicle) : CTaskComplexSA()
 {
-    DEBUG_TRACE("CTaskComplexEnterBoatAsDriverSA::CTaskComplexEnterBoatAsDriverSA(CVehicle* pTargetVehicle)");
-
     CVehicleSA* pTargetVehicleSA = dynamic_cast<CVehicleSA*>(pTargetVehicle);
 
     if (pTargetVehicleSA)
@@ -125,10 +111,6 @@ CTaskComplexEnterBoatAsDriverSA::CTaskComplexEnterBoatAsDriverSA(CVehicle* pTarg
             call    dwFunc
         }
     }
-    else
-    {
-        DEBUG_TRACE("pTargetVehicleSA was invalid!");
-    }
 }
 
 // ##############################################################################
@@ -140,10 +122,6 @@ CTaskComplexLeaveCarSA::CTaskComplexLeaveCarSA(CVehicle* pTargetVehicle, const i
                                                const bool bForceGetOut)
     : CTaskComplexSA()
 {
-    DEBUG_TRACE(
-        "CTaskComplexLeaveCarSA::CTaskComplexLeaveCarSA( CVehicle* pTargetVehicle, const int iTargetDoor, const int iDelayTime, const bool bSensibleLeaveCar, "
-        "const bool bForceGetOut )");
-
     CVehicleSA* pTargetVehicleSA = dynamic_cast<CVehicleSA*>(pTargetVehicle);
 
     if (pTargetVehicleSA)
@@ -176,8 +154,4 @@ CTaskComplexLeaveCarSA::CTaskComplexLeaveCarSA(CVehicle* pTargetVehicle, const i
             pop     ebx
         }
     }
-    else
-    {
-        DEBUG_TRACE("pTargetVehicleSA was invalid!");
-    }
 }
diff --git a/Client/game_sa/TaskGoToSA.cpp b/Client/game_sa/TaskGoToSA.cpp
index 52441f28037..756d727814f 100644
--- a/Client/game_sa/TaskGoToSA.cpp
+++ b/Client/game_sa/TaskGoToSA.cpp
@@ -20,7 +20,6 @@
 
 int CTaskComplexWanderSA::GetWanderType()
 {
-    DEBUG_TRACE("int CTaskComplexWander::GetWanderType()");
     CTaskSAInterface* pTaskInterface = this->GetInterface();
     DWORD             dwFunc = ((TaskComplexWanderVTBL*)pTaskInterface->VTBL)->GetWanderType;
     int               iReturn = NO_WANDER_TYPE;
@@ -54,7 +53,6 @@ CNodeAddress* CTaskComplexWanderSA::GetLastNode()
 
 CTaskComplexWanderStandardSA::CTaskComplexWanderStandardSA(const int iMoveState, const unsigned char iDir, const bool bWanderSensibly)
 {
-    DEBUG_TRACE("CTaskComplexWanderStandardSA::CTaskComplexWanderStandardSA(const int iMoveState, const unsigned char iDir, const bool bWanderSensibly)");
     this->CreateTaskInterface(sizeof(CTaskComplexWanderStandardSAInterface));
     if (!IsValid())
         return;
diff --git a/Client/game_sa/TaskJumpFallSA.cpp b/Client/game_sa/TaskJumpFallSA.cpp
index 64ee4e92e10..c40db29ae2e 100644
--- a/Client/game_sa/TaskJumpFallSA.cpp
+++ b/Client/game_sa/TaskJumpFallSA.cpp
@@ -15,10 +15,6 @@
 CTaskSimpleClimbSA::CTaskSimpleClimbSA(CEntity* pClimbEnt, const CVector& vecTarget, float fHeading, unsigned char nSurfaceType, char nHeight,
                                        const bool bForceClimb)
 {
-    DEBUG_TRACE(
-        "CTaskSimpleClimbSA::CTaskSimpleClimbSA ( CEntity *pClimbEnt, const CVector &vecTarget, float fHeading, unsigned char nSurfaceType, char nHeight, "
-        "const bool bForceClimb )");
-
     this->CreateTaskInterface(sizeof(CTaskSimpleClimbSAInterface));
     if (!IsValid())
         return;
@@ -45,7 +41,6 @@ CTaskSimpleClimbSA::CTaskSimpleClimbSA(CEntity* pClimbEnt, const CVector& vecTar
 
 CTaskSimpleJetPackSA::CTaskSimpleJetPackSA(const CVector* pVecTargetPos, float fCruiseHeight, int nHoverTime)
 {
-    DEBUG_TRACE("CTaskSimpleJetPackSA::CTaskSimpleJetPackSA(const CVector *pVecTargetPos = NULL, float fCruiseHeight = 10.0f, int nHoverTime = 0)");
     this->CreateTaskInterface(sizeof(CTaskSimpleJetPackSAInterface));
     if (!IsValid())
         return;
diff --git a/Client/game_sa/TaskSA.cpp b/Client/game_sa/TaskSA.cpp
index 6e0ab992ea9..053a491fdbb 100644
--- a/Client/game_sa/TaskSA.cpp
+++ b/Client/game_sa/TaskSA.cpp
@@ -22,7 +22,6 @@ DWORD dwTasksCreatedTotal = 0;
 
 CTaskSA::CTaskSA()
 {
-    DEBUG_TRACE("CTaskSA::CTaskSA()");
     Parent = 0;
     TaskInterface = 0;
     dwTasksCreatedTotal++;
@@ -32,14 +31,12 @@ CTaskSA::CTaskSA()
 
 CTaskSA::~CTaskSA()
 {
-    DEBUG_TRACE("CTaskSA::~CTaskSA()");
     dwTasksAlive--;
 }
 
 // alocate memory for the task (ammount nSize)
 void CTaskSA::CreateTaskInterface(size_t nSize)
 {
-    DEBUG_TRACE("void CTaskSA::CreateTaskInterface(size_t nSize)");
 
     // Safety margin. I see GTA allocate more than we do for some tasks. We could create
     // crashes by not allocating enough. Better to potentially waste 12 bytes.
@@ -61,7 +58,6 @@ void CTaskSA::CreateTaskInterface(size_t nSize)
 
 CTask* CTaskSA::Clone()
 {
-    DEBUG_TRACE("CTask * CTaskSA::Clone() ");
     DWORD dwThisInterface = (DWORD)this->GetInterface();
     DWORD dwFunc = this->GetInterface()->VTBL->Clone;
     DWORD dwReturn = 0;
@@ -86,7 +82,6 @@ CTask* CTaskSA::GetSubTask()
 {
     static CTaskManagementSystemSA* s_pTaskManagementSystem = pGame->GetTaskManagementSystem();
 
-    DEBUG_TRACE("CTask * CTaskSA::GetSubTask()");
     DWORD dwThisInterface = (DWORD)this->GetInterface();
     DWORD dwFunc = this->GetInterface()->VTBL->GetSubTask;
     DWORD dwReturn = 0;
@@ -101,7 +96,6 @@ CTask* CTaskSA::GetSubTask()
 
 bool CTaskSA::IsSimpleTask()
 {
-    DEBUG_TRACE("bool CTaskSA::IsSimpleTask()");
     DWORD dwThisInterface = (DWORD)this->GetInterface();
     DWORD dwFunc = this->GetInterface()->VTBL->IsSimpleTask;
     bool  bReturn = 0;
@@ -116,7 +110,6 @@ bool CTaskSA::IsSimpleTask()
 
 int CTaskSA::GetTaskType()
 {
-    DEBUG_TRACE("int CTaskSA::GetTaskType()");
     CTaskSAInterface* pTaskInterface = this->GetInterface();
 
     DWORD dwFunc = pTaskInterface->VTBL->GetTaskType;
@@ -139,7 +132,6 @@ int CTaskSA::GetTaskType()
  */
 void CTaskSA::StopTimer(const CEvent* pEvent)
 {
-    DEBUG_TRACE("void CTaskSA::StopTimer(const CEvent* pEvent)");
     DWORD dwThisInterface = (DWORD)this->GetInterface();
     DWORD dwFunc = this->GetInterface()->VTBL->StopTimer;
     if (dwFunc != 0x82263A && dwFunc)
@@ -158,7 +150,6 @@ void CTaskSA::StopTimer(const CEvent* pEvent)
  */
 bool CTaskSA::MakeAbortable(CPed* pPed, const int iPriority, const CEvent* pEvent)
 {
-    DEBUG_TRACE("bool CTaskSA::MakeAbortable(CPed* pPed, const int iPriority, const CEvent* pEvent)");
 
     CPedSA* pPedSA = dynamic_cast<CPedSA*>(pPed);
     if (!pPedSA)
@@ -185,7 +176,6 @@ bool CTaskSA::MakeAbortable(CPed* pPed, const int iPriority, const CEvent* pEven
 
 const char* CTaskSA::GetTaskName()
 {
-    DEBUG_TRACE("char * CTaskSA::GetTaskName()");
     int iTaskType = GetTaskType();
     if (iTaskType != NO_TASK_TYPE)
         if (TaskNames[iTaskType].szName)
@@ -198,7 +188,6 @@ const char* CTaskSA::GetTaskName()
 
 void CTaskSA::Destroy()
 {
-    DEBUG_TRACE("void CTaskSA::Destroy()");
 
     if (m_bBeingDestroyed)            // we want to make sure we don't delete this twice or we get crashes :)
         return;                       // our hook in CTaskManagementSystem will try to delete this otherwise
@@ -233,7 +222,6 @@ void CTaskSA::Destroy()
 
 void CTaskSA::DestroyJustThis()
 {
-    DEBUG_TRACE("void CTaskSA::DestroyJustThis()");
 
     if (m_bBeingDestroyed)            // we want to make sure we don't delete this twice or we get crashes :)
         return;                       // our hook in CTaskManagementSystem will try to delete this otherwise
@@ -258,7 +246,6 @@ void CTaskSA::SetAsSecondaryPedTask(CPed* pPed, const int iType)
 
 bool CTaskSimpleSA::ProcessPed(CPed* pPed)
 {
-    DEBUG_TRACE("bool CTaskSimpleSA::ProcessPed(CPed* pPed)");
 
     CPedSA* pPedSA = dynamic_cast<CPedSA*>(pPed);
     if (!pPedSA)
@@ -283,8 +270,6 @@ bool CTaskSimpleSA::ProcessPed(CPed* pPed)
 
 bool CTaskSimpleSA::SetPedPosition(CPed* pPed)
 {
-    DEBUG_TRACE("bool CTaskSimpleSA::SetPedPosition(CPed* pPed)");
-
     CPedSA* pPedSA = dynamic_cast<CPedSA*>(pPed);
     if (!pPedSA)
         return false;
@@ -314,14 +299,12 @@ bool CTaskSimpleSA::SetPedPosition(CPed* pPed)
 /*
 CTaskComplexSA::CTaskComplexSA()
 {
-    DEBUG_TRACE("CTaskComplexSA::CTaskComplexSA()");
 //  this->m_pSubTask = 0;
 }
 */
 
 void CTaskComplexSA::SetSubTask(CTask* pSubTask)
 {
-    DEBUG_TRACE("void CTaskComplexSA::SetSubTask(CTask* pSubTask)");
     /*  if(this->m_pSubTask)
             delete this->m_pSubTask;
         else
@@ -343,8 +326,6 @@ void CTaskComplexSA::SetSubTask(CTask* pSubTask)
 
 CTask* CTaskComplexSA::CreateNextSubTask(CPed* pPed)
 {
-    DEBUG_TRACE("CTask * CTaskComplexSA::CreateNextSubTask(CPed* pPed)");
-
     CPedSA* pPedSA = dynamic_cast<CPedSA*>(pPed);
     if (!pPedSA)
         return NULL;
@@ -368,8 +349,6 @@ CTask* CTaskComplexSA::CreateNextSubTask(CPed* pPed)
 
 CTask* CTaskComplexSA::CreateFirstSubTask(CPed* pPed)
 {
-    DEBUG_TRACE("CTask * CTaskComplexSA::CreateFirstSubTask(CPed* pPed)");
-
     CPedSA* pPedSA = dynamic_cast<CPedSA*>(pPed);
     if (!pPedSA)
         return NULL;
@@ -393,8 +372,6 @@ CTask* CTaskComplexSA::CreateFirstSubTask(CPed* pPed)
 
 CTask* CTaskComplexSA::ControlSubTask(CPed* pPed)
 {
-    DEBUG_TRACE("CTask * CTaskComplexSA::ControlSubTask(CPed* pPed)");
-
     CPedSA* pPedSA = dynamic_cast<CPedSA*>(pPed);
     if (!pPedSA)
         return NULL;
diff --git a/Client/game_sa/gamesa_init.cpp b/Client/game_sa/gamesa_init.cpp
index f586be841ff..e2e976615fe 100644
--- a/Client/game_sa/gamesa_init.cpp
+++ b/Client/game_sa/gamesa_init.cpp
@@ -24,8 +24,6 @@ CCoreInterface* g_pCore = NULL;
 // in order for proper initialization to occur.
 MTAEXPORT CGame* GetGameInterface(CCoreInterface* pCore)
 {
-    DEBUG_TRACE("CGame * GetGameInterface()");
-
     g_pNet = pCore->GetNetwork();
     assert(g_pNet);
 
diff --git a/Client/multiplayer_sa/CRemoteDataSA.h b/Client/multiplayer_sa/CRemoteDataSA.h
index b1204a5b0f7..e565f7fa841 100644
--- a/Client/multiplayer_sa/CRemoteDataSA.h
+++ b/Client/multiplayer_sa/CRemoteDataSA.h
@@ -19,7 +19,6 @@
 
 // These includes have to be fixed!
 #include "../game_sa/CPadSA.h"
-#include "../game_sa/common.h"
 
 class CRemoteDataStorageSA : public CRemoteDataStorage
 {
diff --git a/Client/multiplayer_sa/StdInc.h b/Client/multiplayer_sa/StdInc.h
index 28a7a651384..291d814f227 100644
--- a/Client/multiplayer_sa/StdInc.h
+++ b/Client/multiplayer_sa/StdInc.h
@@ -36,7 +36,6 @@
 #include "..\game_sa\CEntitySA.h"
 #include "..\game_sa\CBuildingSA.h"
 #include "..\game_sa\CPedSA.h"
-#include "..\game_sa\common.h"
 #include "..\core\CCrashDumpWriter.h"
 
 extern CMultiplayerSA* pMultiplayer;
diff --git a/Client/sdk/game/C3DMarker.h b/Client/sdk/game/C3DMarker.h
index 441c71f999c..3c4d2e0a669 100644
--- a/Client/sdk/game/C3DMarker.h
+++ b/Client/sdk/game/C3DMarker.h
@@ -30,7 +30,7 @@ class C3DMarker
     virtual void     SetPosition(CVector* vecPosition) = 0;
     virtual CVector* GetPosition() = 0;
     virtual DWORD    GetType() = 0;            // need enum?
-    virtual BOOL     IsActive() = 0;
+    virtual bool     IsActive() = 0;
     virtual DWORD    GetIdentifier() = 0;
     virtual SharedUtil::SColor GetColor() = 0;
     virtual void     SetColor(const SharedUtil::SColor color) = 0;
diff --git a/Client/sdk/game/CAERadioTrackManager.h b/Client/sdk/game/CAERadioTrackManager.h
index 3bf08b1d092..e07c20a7ce1 100644
--- a/Client/sdk/game/CAERadioTrackManager.h
+++ b/Client/sdk/game/CAERadioTrackManager.h
@@ -17,7 +17,7 @@ class CAERadioTrackManager
     virtual BYTE  GetCurrentRadioStationID() = 0;
     virtual BYTE  IsVehicleRadioActive() = 0;
     virtual char* GetRadioStationName(BYTE bStationID) = 0;
-    virtual BOOL  IsRadioOn() = 0;
+    virtual bool  IsRadioOn() = 0;
     virtual void  SetBassSetting(DWORD dwBass) = 0;
     virtual void  Reset() = 0;
     virtual void  StartRadio(BYTE bStationID, BYTE bUnknown) = 0;
diff --git a/Client/sdk/game/CCamera.h b/Client/sdk/game/CCamera.h
index 36d30a1e788..672cfaa9c09 100644
--- a/Client/sdk/game/CCamera.h
+++ b/Client/sdk/game/CCamera.h
@@ -126,8 +126,8 @@ class CCamera
     virtual float     Find3rdPersonQuickAimPitch() = 0;
     virtual BYTE      GetActiveCam() = 0;
     virtual CCam*     GetCam(BYTE bCameraID) = 0;
-    virtual void      SetWidescreen(BOOL bWidescreen) = 0;
-    virtual BOOL      GetWidescreen() = 0;
+    virtual void      SetWidescreen(bool bWidescreen) = 0;
+    virtual bool      GetWidescreen() = 0;
     virtual bool      IsFading() = 0;
     virtual int       GetFadingDirection() = 0;
     virtual void      Fade(float fFadeOutTime, int iOutOrIn) = 0;
diff --git a/Client/sdk/game/CCheckpoint.h b/Client/sdk/game/CCheckpoint.h
index b30b2e104a5..3492c46e5d3 100644
--- a/Client/sdk/game/CCheckpoint.h
+++ b/Client/sdk/game/CCheckpoint.h
@@ -41,7 +41,7 @@ class CCheckpoint
     virtual void     SetPointDirection(CVector* vecPointDirection) = 0;
     virtual CVector* GetPointDirection() = 0;
     virtual DWORD    GetType() = 0;            // need enum?
-    virtual BOOL     IsActive() = 0;
+    virtual bool     IsActive() = 0;
     virtual DWORD    GetIdentifier() = 0;
     virtual SharedUtil::SColor GetColor() = 0;
     virtual void     SetColor(const SharedUtil::SColor color) = 0;
diff --git a/Client/sdk/game/CDamageManager.h b/Client/sdk/game/CDamageManager.h
index 75512832446..81fda712678 100644
--- a/Client/sdk/game/CDamageManager.h
+++ b/Client/sdk/game/CDamageManager.h
@@ -141,5 +141,5 @@ class CDamageManager
     virtual BYTE          GetAeroplaneCompStatus(BYTE CompID) = 0;
     virtual void          SetAeroplaneCompStatus(BYTE CompID, BYTE Status) = 0;            // component ids begin at 12 - probably
 
-    virtual void FuckCarCompletely(BOOL bKeepWheels) = 0;
+    virtual void FuckCarCompletely(bool bKeepWheels) = 0;
 };
diff --git a/Client/sdk/game/CDoor.h b/Client/sdk/game/CDoor.h
index c0b3162a996..da2df0c5396 100644
--- a/Client/sdk/game/CDoor.h
+++ b/Client/sdk/game/CDoor.h
@@ -17,8 +17,8 @@ class CDoor
 {
 public:
     virtual float      GetAngleOpenRatio() = 0;
-    virtual BOOL       IsClosed() = 0;
-    virtual BOOL       IsFullyOpen() = 0;
+    virtual bool       IsClosed() = 0;
+    virtual bool       IsFullyOpen() = 0;
     virtual void       Open(float fRatio) = 0;
     virtual eDoorState GetDoorState() = 0;
 };
diff --git a/Client/sdk/game/CEntity.h b/Client/sdk/game/CEntity.h
index 363c3a69488..b1b7e5d3aeb 100644
--- a/Client/sdk/game/CEntity.h
+++ b/Client/sdk/game/CEntity.h
@@ -88,11 +88,11 @@ class CEntity
     virtual void SetVisible(bool bVisible) = 0;
 
     virtual void SetDoNotRemoveFromGameWhenDeleted(bool bDoNotRemoveFromGame) = 0;
-    virtual void SetUsesCollision(BOOL bUsesCollision) = 0;
-    virtual BOOL IsBackfaceCulled() = 0;
-    virtual void SetBackfaceCulled(BOOL bBackfaceCulled) = 0;
-    virtual BOOL IsStatic() = 0;
-    virtual void SetStatic(BOOL bStatic) = 0;
+    virtual void SetUsesCollision(bool bUsesCollision) = 0;
+    virtual bool IsBackfaceCulled() = 0;
+    virtual void SetBackfaceCulled(bool bBackfaceCulled) = 0;
+    virtual bool IsStatic() = 0;
+    virtual void SetStatic(bool bStatic) = 0;
     virtual void SetAlpha(DWORD dwAlpha) = 0;
 
     virtual void MatrixConvertFromEulerAngles(float fX, float fY, float fZ, int iUnknown) = 0;
diff --git a/Client/sdk/game/CEventList.h b/Client/sdk/game/CEventList.h
index 49e912065f1..798c5002e08 100644
--- a/Client/sdk/game/CEventList.h
+++ b/Client/sdk/game/CEventList.h
@@ -14,7 +14,6 @@
 #include "Common.h"
 
 class CEntity;
-class CEvent;
 class CEventDamage;
 class CEventDamageSAInterface;
 class CEventGunShot;
@@ -23,10 +22,6 @@ class CVector;
 class CEventList
 {
 public:
-    virtual CEvent* FindClosestEvent(eEventType eventtype, CVector* vecPosition) = 0;
-    virtual CEvent* GetEvent(DWORD ID) = 0;
-    virtual CEvent* GetEvent(eEventType eventtype) = 0;
-
     virtual CEventDamage* GetEventDamage(CEventDamageSAInterface* pInterface) = 0;
 
     virtual CEventDamage*  CreateEventDamage(CEntity* pEntity, unsigned int i_1, eWeaponType weaponType, ePedPieceTypes hitZone, unsigned char uc_2, bool b_3,
diff --git a/Client/sdk/game/CFire.h b/Client/sdk/game/CFire.h
index 5c404953ee4..9a0bda06572 100644
--- a/Client/sdk/game/CFire.h
+++ b/Client/sdk/game/CFire.h
@@ -26,9 +26,9 @@ class CFire
     virtual CEntity*        GetCreator() = 0;
     virtual CEntity*        GetEntityOnFire() = 0;
     virtual void            SetTarget(CEntity* entity) = 0;
-    virtual BOOL            IsIgnited() = 0;
-    virtual void            SetSilent(BOOL bSilent) = 0;
-    virtual BOOL            IsBeingExtinguished() = 0;
+    virtual bool            IsIgnited() = 0;
+    virtual void            SetSilent(bool bSilent) = 0;
+    virtual bool            IsBeingExtinguished() = 0;
     virtual void            Ignite() = 0;
     virtual float           GetStrength() = 0;
     virtual void            SetStrength(float fStrength) = 0;
diff --git a/Client/sdk/game/CGame.h b/Client/sdk/game/CGame.h
index 4a119283b44..12d5f7bea61 100644
--- a/Client/sdk/game/CGame.h
+++ b/Client/sdk/game/CGame.h
@@ -152,7 +152,7 @@ class __declspec(novtable) CGame
     virtual CModelInfo*  GetModelInfo(DWORD dwModelID, bool bCanBeInvalid = false) = 0;
 
     virtual DWORD        GetSystemTime() = 0;
-    virtual BOOL         IsAtMenu() = 0;
+    virtual bool         IsAtMenu() = 0;
     virtual void         StartGame() = 0;
     virtual void         SetSystemState(eSystemState State) = 0;
     virtual eSystemState GetSystemState() = 0;
@@ -167,7 +167,7 @@ class __declspec(novtable) CGame
     virtual void Reset() = 0;
     virtual void Terminate() = 0;
 
-    virtual BOOL InitLocalPlayer(class CClientPed* pClientPed) = 0;
+    virtual bool InitLocalPlayer(class CClientPed* pClientPed) = 0;
 
     virtual float GetGravity() = 0;
     virtual void  SetGravity(float fGravity) = 0;
diff --git a/Client/sdk/game/CMarker.h b/Client/sdk/game/CMarker.h
index 130f971f20f..e30a6c09309 100644
--- a/Client/sdk/game/CMarker.h
+++ b/Client/sdk/game/CMarker.h
@@ -32,7 +32,7 @@ class CMarker
     virtual void     SetColor(eMarkerColor color) = 0;
     virtual void     SetColor(const SharedUtil::SColor color) = 0;
     virtual void     Remove() = 0;
-    virtual BOOL     IsActive() = 0;
+    virtual bool     IsActive() = 0;
     virtual void     SetPosition(CVector* vecPosition) = 0;
     virtual void     SetEntity(CVehicle* vehicle) = 0;
     virtual void     SetEntity(CPed* ped) = 0;
diff --git a/Client/sdk/game/CModelInfo.h b/Client/sdk/game/CModelInfo.h
index 811dfc23d93..77ecc79a996 100644
--- a/Client/sdk/game/CModelInfo.h
+++ b/Client/sdk/game/CModelInfo.h
@@ -117,24 +117,24 @@ class CModelInfo
     virtual eModelInfoType GetModelType() = 0;
     virtual DWORD          GetModel() = 0;
     virtual bool           IsPlayerModel() = 0;
-    virtual BOOL           IsBoat() = 0;
-    virtual BOOL           IsCar() = 0;
-    virtual BOOL           IsTrain() = 0;
-    virtual BOOL           IsHeli() = 0;
-    virtual BOOL           IsPlane() = 0;
-    virtual BOOL           IsBike() = 0;
-    virtual BOOL           IsFakePlane() = 0;
-    virtual BOOL           IsMonsterTruck() = 0;
-    virtual BOOL           IsQuadBike() = 0;
-    virtual BOOL           IsBmx() = 0;
-    virtual BOOL           IsTrailer() = 0;
+    virtual bool           IsBoat() = 0;
+    virtual bool           IsCar() = 0;
+    virtual bool           IsTrain() = 0;
+    virtual bool           IsHeli() = 0;
+    virtual bool           IsPlane() = 0;
+    virtual bool           IsBike() = 0;
+    virtual bool           IsFakePlane() = 0;
+    virtual bool           IsMonsterTruck() = 0;
+    virtual bool           IsQuadBike() = 0;
+    virtual bool           IsBmx() = 0;
+    virtual bool           IsTrailer() = 0;
     virtual bool           IsVehicle() const = 0;
 
     virtual char* GetNameIfVehicle() = 0;
 
     virtual BYTE           GetVehicleType() = 0;
     virtual void           Request(EModelRequestType requestType, const char* szTag /* = NULL*/) = 0;
-    virtual BOOL           IsLoaded() = 0;
+    virtual bool           IsLoaded() = 0;
     virtual BYTE           GetFlags() = 0;
     virtual CBoundingBox*  GetBoundingBox() = 0;
     virtual bool           IsValid() = 0;
@@ -155,7 +155,7 @@ class CModelInfo
 
     virtual float GetDistanceFromCentreOfMassToBaseOfModel() = 0;
 
-    virtual void SetAlphaTransparencyEnabled(BOOL bEnabled) = 0;
+    virtual void SetAlphaTransparencyEnabled(bool bEnabled) = 0;
     virtual bool IsAlphaTransparencyEnabled() = 0;
     virtual void ResetAlphaTransparency() = 0;
 
diff --git a/Client/sdk/game/CPickup.h b/Client/sdk/game/CPickup.h
index 474990b3ebf..46879d81009 100644
--- a/Client/sdk/game/CPickup.h
+++ b/Client/sdk/game/CPickup.h
@@ -42,7 +42,4 @@ class CPickup
     virtual void         Remove() = 0;
     virtual void         GiveUsAPickUpObject(int ForcedObjectIndex = -1) = 0;
     virtual void         GetRidOfObjects() = 0;
-};
-
-// not used
-typedef BOOL (*CBPickup)(CPickup*);
+};
\ No newline at end of file
diff --git a/Client/sdk/game/CStreaming.h b/Client/sdk/game/CStreaming.h
index 4609ea2aa68..c83e950f547 100644
--- a/Client/sdk/game/CStreaming.h
+++ b/Client/sdk/game/CStreaming.h
@@ -44,8 +44,8 @@ class CStreaming
 public:
     virtual void            RequestModel(DWORD dwModelID, DWORD dwFlags) = 0;
     virtual void            RemoveModel(std::uint32_t model) = 0;
-    virtual void            LoadAllRequestedModels(BOOL bOnlyPriorityModels = 0, const char* szTag = NULL) = 0;
-    virtual BOOL            HasModelLoaded(DWORD dwModelID) = 0;
+    virtual void            LoadAllRequestedModels(bool bOnlyPriorityModels = false, const char* szTag = NULL) = 0;
+    virtual bool            HasModelLoaded(DWORD dwModelID) = 0;
     virtual void            RequestSpecialModel(DWORD model, const char* szTexture, DWORD channel) = 0;
     virtual CStreamingInfo* GetStreamingInfoFromModelId(uint32 id) = 0;
     virtual void            ReinitStreaming() = 0;