diff --git a/extension.cpp b/extension.cpp
index e62dff0..9072906 100644
--- a/extension.cpp
+++ b/extension.cpp
@@ -119,6 +119,7 @@ static struct SrcdsPatch
 		(unsigned char *)"\x90\x90\x90\x90\x90\x90\x90\x90\x90\x90\x90\x90\x90\x90",
 		0, 0, 0, false
 	},
+	/*
 	// 2: only select CT spawnpoints
 	{
 		"_ZN9CCSPlayer19EntSelectSpawnPointEv",
@@ -135,6 +136,7 @@ static struct SrcdsPatch
 		(unsigned char *)"\x0F\x85\xA8\x00\x00\x00\x8B\x83\x80\x02\x00\x00\x85\xC0\x0F\x85\x9A\x00\x00\x00\x90\x90\x90\x90\x90\x90\x90\x90",
 		0, 0, 0, false
 	},
+	*/
 	// 5: disable alive check in point_viewcontrol->Disable
 	{
 		"_ZN14CTriggerCamera7DisableEv",
@@ -254,9 +256,11 @@ DETOUR_DECL_MEMBER1(DETOUR_PostConstructor, void, const char *, szClassname)
 		// Spawnpoints don't need edicts...
 		*(uint32 *)((intptr_t)pEntity + td->fieldOffset[TD_OFFSET_NORMAL]) |= (1<<9); // EFL_SERVER_ONLY
 
+		/*
 		// Only CT spawnpoints
 		if(strcasecmp(szClassname, "info_player_terrorist") == 0)
 			szClassname = "info_player_counterterrorist";
+		*/
 	}
 
 	DETOUR_MEMBER_CALL(DETOUR_PostConstructor)(szClassname);
@@ -325,7 +329,8 @@ DETOUR_DECL_MEMBER2(DETOUR_KeyValue, bool, const char *, szKeyName, const char *
 	// Fix crash bug in engine
 	if(strcasecmp(szKeyName, "angle") == 0)
 		szKeyName = "angles";
-
+	
+	/*
 	else if(strcasecmp(szKeyName, "classname") == 0 &&
 		strcasecmp(szValue, "info_player_terrorist") == 0)
 	{
@@ -341,6 +346,7 @@ DETOUR_DECL_MEMBER2(DETOUR_KeyValue, bool, const char *, szKeyName, const char *
 		if(pClassname && strcasecmp(pClassname, "func_buyzone") == 0)
 			szValue = "3";
 	}
+	*/
 
 	return DETOUR_MEMBER_CALL(DETOUR_KeyValue)(szKeyName, szValue);
 }