diff --git a/dlls/engine/amxxapi.cpp b/dlls/engine/amxxapi.cpp
index bb5c0628..750b73c8 100755
--- a/dlls/engine/amxxapi.cpp
+++ b/dlls/engine/amxxapi.cpp
@@ -13,11 +13,7 @@ int AmxStringToEngine(AMX *amx, cell param, int &len)
 
 void ClearHooks()
 {
-	register unsigned int i = 0;
-	for (i=0; i<256; i++) {
-		msgHooks[i].clear();
-		msgBlocks[i] = 0;
-	}
+	size_t i;
 
 	for (i=0; i<Touches.size(); i++)
 		delete Touches[i];
@@ -26,9 +22,6 @@ void ClearHooks()
 	for (i=0; i<Thinks.size(); i++)
 		delete Thinks[i];
 
-	for (i=0; i<256; i++)
-		msgHooks[i].clear();
-
 	Touches.clear();
 	Impulses.clear();
 	Thinks.clear();
@@ -43,7 +36,6 @@ void OnAmxxAttach()
 	ClientKillForward = 0;
 	CmdStartForward = 0;
 	StartFrameForward = 0;
-	MF_AddNatives(msg_Natives);
 	MF_AddNatives(ent_Natives);
 	MF_AddNatives(engine_Natives);
 	MF_AddNatives(global_Natives);
diff --git a/dlls/engine/engine.h b/dlls/engine/engine.h
index eed28bbf..bf78814a 100755
--- a/dlls/engine/engine.h
+++ b/dlls/engine/engine.h
@@ -9,7 +9,6 @@
 #include "CVector.h"
 #include "CString.h"
 #include <usercmd.h>
-#include "messages.h"
 #include "entity.h"
 #include "gpglobals.h"
 
diff --git a/dlls/engine/engine.vcproj b/dlls/engine/engine.vcproj
index f19eea57..59d4be87 100755
--- a/dlls/engine/engine.vcproj
+++ b/dlls/engine/engine.vcproj
@@ -132,9 +132,6 @@
 			<File
 				RelativePath=".\globals.cpp">
 			</File>
-			<File
-				RelativePath=".\messages.cpp">
-			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -155,9 +152,6 @@
 			<File
 				RelativePath=".\gpglobals.h">
 			</File>
-			<File
-				RelativePath=".\messages.h">
-			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
diff --git a/dlls/engine/moduleconfig.h b/dlls/engine/moduleconfig.h
index c21881fb..bd9420e5 100755
--- a/dlls/engine/moduleconfig.h
+++ b/dlls/engine/moduleconfig.h
@@ -233,16 +233,16 @@
 #define FN_LightStyle						LightStyle
 // #define FN_DecalIndex						DecalIndex
 // #define FN_PointContents						PointContents
-#define FN_MessageBegin						MessageBegin
-#define FN_MessageEnd						MessageEnd
-#define FN_WriteByte							WriteByte
-#define FN_WriteChar							WriteChar
-#define FN_WriteShort						WriteShort
-#define FN_WriteLong							WriteLong
-#define FN_WriteAngle						WriteAngle
-#define FN_WriteCoord						WriteCoord
-#define FN_WriteString						WriteString
-#define FN_WriteEntity						WriteEntity
+// #define FN_MessageBegin						MessageBegin
+// #define FN_MessageEnd						MessageEnd
+// #define FN_WriteByte							WriteByte
+// #define FN_WriteChar							WriteChar
+// #define FN_WriteShort						WriteShort
+// #define FN_WriteLong							WriteLong
+// #define FN_WriteAngle						WriteAngle
+// #define FN_WriteCoord						WriteCoord
+// #define FN_WriteString						WriteString
+// #define FN_WriteEntity						WriteEntity
 // #define FN_CVarRegister						CVarRegister
 // #define FN_CVarGetFloat						CVarGetFloat
 // #define FN_CVarGetString						CVarGetString