diff --git a/extension.cpp b/extension.cpp
index a769bb8..0d7bef0 100644
--- a/extension.cpp
+++ b/extension.cpp
@@ -166,21 +166,21 @@ static struct SrcdsPatch
 		"cstrike/bin/server_srv.so"
 	},
 	// 2: only select CT spawnpoints
-	{
+	/*{
 		"_ZN9CCSPlayer19EntSelectSpawnPointEv",
 		(unsigned char *)"\x74\x57\x83\xEC\x0C\x53\xE8\x6E\x34\xCA\xFF\x83\xC4\x10\x83\xF8\x02\x0F\x84",
 		"x?xx?xx????xx?xx?xx",
 		(unsigned char *)"\xEB\x57\x83\xEC\x0C\x53\xE8\x6E\x34\xCA\xFF\x83\xC4\x10\x83\xF8\x02\x0F\x84",
 		"cstrike/bin/server_srv.so"
-	},
+	},*/
 	// 3: don't check if we have T spawns
-	{
+	/*{
 		"_ZN12CCSGameRules18NeededPlayersCheckERb",
 		(unsigned char *)"\x74\x0A\x8B\x83\x94\x02\x00\x00\x85\xC0\x75\x4A\x83\xEC\x0C\x68\xE8\xCF\x93\x00\xE8\xA9\x46\x52\x00\x5A\x59",
 		"xxxx????xxx?xx?x????x????xx",
 		       (unsigned char *)"\x75\x54\x8B\x83\x94\x02\x00\x00\x85\xC0\x75\x4A\x90\x90\x90\x90\x90\x90\x90\x90\x90\x90\x90\x90\x90\x90\x90",
 		"cstrike/bin/server_srv.so"
-	},
+	},*/
 	// 5: disable alive check in point_viewcontrol->Disable
 	{
 		"_ZN14CTriggerCamera7DisableEv",
@@ -427,8 +427,8 @@ DETOUR_DECL_MEMBER1(DETOUR_PostConstructor, void, const char *, szClassname)
 		*(uint32 *)((intptr_t)pEntity + offset) |= (1<<9); // EFL_SERVER_ONLY
 
 		// Only CT spawnpoints
-		if(strcasecmp(szClassname, "info_player_terrorist") == 0)
-			szClassname = "info_player_counterterrorist";
+		/*if(strcasecmp(szClassname, "info_player_terrorist") == 0)
+			szClassname = "info_player_counterterrorist";*/
 
 		DETOUR_MEMBER_CALL(DETOUR_PostConstructor)(szClassname);
 		return;
@@ -523,20 +523,20 @@ DETOUR_DECL_MEMBER2(DETOUR_KeyValue, bool, const char *, szKeyName, const char *
 	{
 		szKeyName = "angles";
 	}
-	else if(strcasecmp(szKeyName, "classname") == 0 &&
+	/*else if(strcasecmp(szKeyName, "classname") == 0 &&
 		strcasecmp(szValue, "info_player_terrorist") == 0)
 	{
 		// Only CT spawnpoints
 		szValue = "info_player_counterterrorist";
-	}
-	else if(strcasecmp(szKeyName, "teamnum") == 0 || strcasecmp(szKeyName, "teamnum") == 0 )
+	}*/
+	/*else if(strcasecmp(szKeyName, "teamnum") == 0 || strcasecmp(szKeyName, "teamnum") == 0 )
 	{
 		const char *pClassname = gamehelpers->GetEntityClassname(pEntity);
 
 		// All buyzones should be CT buyzones
 		if(pClassname && strcasecmp(pClassname, "func_buyzone") == 0)
 			szValue = "3";
-	}
+	}*/
 	else if(strcasecmp(szKeyName, "absvelocity") == 0)
 	{
 		static int m_AbsVelocity_offset = 0;