diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5c2d6822..c5654ede 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,7 +29,7 @@ project (HLSDK-XASH3D)
 option(USE_VGUI "Enable VGUI1. UNDONE" OFF)
 option(USE_VGUI2 "Enable VGUI2. UNDONE" OFF)
 option(USE_VOICEMGR "Enable VOICE MANAGER." OFF)
-option(BUILD_CLIENT "Build client dll" ON)
+option(BUILD_CLIENT "Build client dll" OFF)
 option(BUILD_SERVER "Build server dll" ON)
 
 #-----------------
@@ -59,4 +59,4 @@ endif()
 
 if(NOT BUILD_SERVER AND NOT BUILD_CLIENT)
 	error("Nothing to build")
-endif()
\ No newline at end of file
+endif()
diff --git a/dlls/halloween/shall_map_fixes.cpp b/dlls/halloween/shall_map_fixes.cpp
index 2c9b68f0..aea39cef 100644
--- a/dlls/halloween/shall_map_fixes.cpp
+++ b/dlls/halloween/shall_map_fixes.cpp
@@ -25,8 +25,6 @@
 #include "gamerules.h"
 #include "shall_map_fixes.h"
 
-#if defined ( SHALL_MAPFIXES )
-
 #define RANDOM_ANGLE() Vector( 0, RANDOM_LONG(1, 6) * RANDOM_LONG(1, 6) * RANDOM_LONG(1, 10), 0 )
 
 static CBaseEntity* CreateItemAtPosition(char* classname, const Vector& position, const Vector& angles)
@@ -791,5 +789,3 @@ void MapFixes_ApplyAllPossibleFixes()
 		GetMapFixesSingleton()->ApplyMapFixWoods();
 	}
 }
-
-#endif // defined ( SHALL_MAPFIXES )
\ No newline at end of file