diff --git a/src/Components/Modules/AntiCheat.cpp b/src/Components/Modules/AntiCheat.cpp
index 220251ec..8b5d65b8 100644
--- a/src/Components/Modules/AntiCheat.cpp
+++ b/src/Components/Modules/AntiCheat.cpp
@@ -7,8 +7,6 @@ namespace Components
 	Utils::Hook AntiCheat::LoadLibHook[4];
 	unsigned long AntiCheat::Flags = NO_FLAG;
 
-	bool AntiCheat::ScanIntegrityIsInOrder;
-
 	// This function does nothing, it only adds the two passed variables and returns the value
 	// The only important thing it does is to clean the first parameter, and then return
 	// By returning, the crash procedure will be called, as it hasn't been cleaned from the stack
@@ -31,63 +29,6 @@ namespace Components
 		}
 	}
 
-#if 0
-	__declspec(naked) void AntiCheat::CrashClient()
-	{
-		static uint8_t crashProcedure[] =
-		{
-			// Variable space
-			0xDC, 0xC1, 0xDC, 0x05, 
-
-			// Uninstall minidump handler
-			// This doesn't work anymore, due to the SetUnhandledExceptionFilter hook, but that's not important
-			//0xB8, 0x63, 0xE7, 0x2F, 0x00,           // mov  eax, 2FE763h
-			//0x05, 0xAD, 0xAD, 0x3C, 0x00,           // add  eax, 3CADADh
-			//0x6A, 0x58,                             // push 88
-			//0x8B, 0x80, 0xEA, 0x01, 0x00, 0x00,     // mov  eax, [eax + 1EAh]
-			//0xFF, 0x10,                             // call dword ptr [eax]
-
-			// Crash me.
-			0xB8, 0x4F, 0x91, 0x27, 0x00,           // mov  eax, 27914Fh
-			0x05, 0xDD, 0x28, 0x1A, 0x00,           // add  eax, 1A28DDh
-			0x80, 0x00, 0x68,                       // add  byte ptr [eax], 68h
-			0xC3,                                   // retn
-
-			// Random stuff
-			0xBE, 0xFF, 0xC2, 0xF4, 0x3A,
-		};
-
-		__asm
-		{
-			// This does absolutely nothing :P
-			xor eax, eax
-			mov ebx, [esp + 4h]
-			shl ebx, 4h
-			setz bl
-
-			// Push the fake var onto the stack
-			push ebx
-
-			// Save the address to our crash procedure
-			mov eax, offset crashProcedure
-			push eax
-
-			// Unprotect the .text segment
-			push eax
-			push 40h
-			push 2D5FFFh
-			push 401001h
-			call VirtualProtect
-
-			// Increment to our crash procedure
-			// Skip variable space
-			add dword ptr [esp], 4h
-
-			// This basically removes the pushed ebx value from the stack, so returning results in a call to the procedure
-			jmp AntiCheat::NullSub
-		}
-	}
-#else
 	void AntiCheat::CrashClient()
 	{
 #ifdef DEBUG_DETECTIONS
@@ -106,7 +47,6 @@ namespace Components
 		}
 #endif
 	}
-#endif
 
 	void AntiCheat::AssertCalleeModule(void* callee)
 	{
@@ -204,17 +144,6 @@ namespace Components
 
 	void AntiCheat::ScanIntegrityCheck()
 	{
-		if (!AntiCheat::ScanIntegrityIsInOrder)
-		{
-#ifdef DEBUG_DETECTIONS
-			Logger::Print("AntiCheat: Integrity order check failed");
-#endif
-
-			AntiCheat::CrashClient();
-		}
-
-		AntiCheat::ScanIntegrityIsInOrder = false;
-
 		// If there was no check within the last 40 seconds, crash!
 		if (AntiCheat::LastCheck.Elapsed(40s))
 		{
@@ -231,8 +160,6 @@ namespace Components
 
 	void AntiCheat::PerformScan()
 	{
-		AntiCheat::ScanIntegrityIsInOrder = true;
-
 		// Perform check only every 10 seconds
 		if (!AntiCheat::LastCheck.Elapsed(10s)) return;
 		AntiCheat::LastCheck.Set();
@@ -539,7 +466,6 @@ namespace Components
 	{
 		AntiCheat::Flags = NO_FLAG;
 		AntiCheat::Hash.clear();
-		AntiCheat::ScanIntegrityIsInOrder = false;
 
 #ifdef DEBUG
 		Command::Add("penis", [] (Command::Params)
diff --git a/src/Components/Modules/AntiCheat.hpp b/src/Components/Modules/AntiCheat.hpp
index bbdbe22b..b32bf3b3 100644
--- a/src/Components/Modules/AntiCheat.hpp
+++ b/src/Components/Modules/AntiCheat.hpp
@@ -39,8 +39,6 @@ namespace Components
 		static std::string Hash;
 		static unsigned long Flags;
 
-		static bool ScanIntegrityIsInOrder;
-
 		static void PerformScan();
 		static void PatchWinAPI();
 
diff --git a/src/Components/Modules/Discovery.cpp b/src/Components/Modules/Discovery.cpp
index 9dcba6bc..d8391206 100644
--- a/src/Components/Modules/Discovery.cpp
+++ b/src/Components/Modules/Discovery.cpp
@@ -82,8 +82,13 @@ namespace Components
 		});
 
 		// This is placed here in case the anticheat has been disabled!
+		// Make sure this is called after the memory scan!
 #ifndef DEBUG
-		Renderer::OnFrame(AntiCheat::ScanIntegrityCheck);
+		Utils::Hook(0x5ACB9E, [] () // Somewhere in the renderer, past the scan check
+		{
+			AntiCheat::ScanIntegrityCheck();
+			return Utils::Hook::Call<void()>(0x4AA720)();
+		}, HOOK_CALL).Install()->Quick();
 #endif
 	}
 
diff --git a/src/Components/Modules/Gametypes.cpp b/src/Components/Modules/Gametypes.cpp
index 506ed034..f0d71dde 100644
--- a/src/Components/Modules/Gametypes.cpp
+++ b/src/Components/Modules/Gametypes.cpp
@@ -98,5 +98,15 @@ namespace Components
 		// Dynamically grab gametypes
 		Utils::Hook(0x5FA46C, Gametypes::BuildGametypeList, HOOK_CALL).Install()->Quick(); // Scr_UpdateGameTypeList
 		Utils::Hook(0x632155, Gametypes::BuildGametypeList, HOOK_CALL).Install()->Quick(); // UI_UpdateGameTypesList
+
+		// This is placed here in case the anticheat has been disabled!
+		// Make sure this is called after every onther anticheat check!
+#ifndef DEBUG
+		Utils::Hook(0x5ACBA3, [] () // Somewhere in the renderer, past other renderer hooks!
+		{
+			AntiCheat::FlagIntegrityCheck();
+			return Utils::Hook::Call<void()>(0x50AB20)();
+		}, HOOK_CALL).Install()->Quick();
+#endif
 	}
 }
diff --git a/src/Components/Modules/RawFiles.cpp b/src/Components/Modules/RawFiles.cpp
index 81da05da..66ca836f 100644
--- a/src/Components/Modules/RawFiles.cpp
+++ b/src/Components/Modules/RawFiles.cpp
@@ -21,11 +21,6 @@ namespace Components
 		// remove fs_game check for moddable rawfiles - allows non-fs_game to modify rawfiles
 		Utils::Hook::Nop(0x61AB76, 2);
 
-		// This is placed here in case the anticheat has been disabled!
-#ifndef DEBUG
-		QuickPatch::OnFrame(AntiCheat::FlagIntegrityCheck);
-#endif
-
 		Command::Add("dumpraw", [] (Command::Params params)
 		{
 			if (params.Length() < 2)