diff --git a/dlls/hamsandwich/Trampolines.h b/dlls/hamsandwich/Trampolines.h
index 89cf1b06..240b41d9 100644
--- a/dlls/hamsandwich/Trampolines.h
+++ b/dlls/hamsandwich/Trampolines.h
@@ -428,10 +428,8 @@ namespace Trampolines
 			Append(&code[0],sizeof(::Trampolines::Bytecode::codePushThis));
 
 #if defined __linux__
-			TPRINT(("mystack=%d+4\n",m_mystack));
 			m_mystack+=4;
 #endif
-			TPRINT(("calledstack=%d+4\n",m_calledstack));
 			m_calledstack+=4;
 		};
 
@@ -441,7 +439,6 @@ namespace Trampolines
 		void FreeMyStack(void)
 		{
 
-			TPRINT(("freeing mystack=%d+4\n",m_mystack));
 			this->FreeStack(m_mystack);
 		};
 
@@ -450,7 +447,6 @@ namespace Trampolines
 		 */
 		void FreeTargetStack(void)
 		{
-			TPRINT(("freeing calledstack=%d+4\n",m_calledstack));
 			this->FreeStack(m_calledstack);
 		};
 
@@ -460,8 +456,6 @@ namespace Trampolines
 		 */
 		void FreeBothStacks(void)
 		{
-			TPRINT(("freeing mystack=%d+4\n",m_mystack));
-			TPRINT(("freeing calledstack=%d+4\n",m_calledstack));
 			this->FreeStack(m_calledstack + m_mystack);
 		};
 
@@ -525,7 +519,6 @@ namespace Trampolines
 
 			Append(&code[0],sizeof(::Trampolines::Bytecode::codePushID));
 
-			TPRINT(("calledstack=%d+4\n",m_calledstack));
 			m_calledstack+=4; // increase auto detected stack size
 
 		};
@@ -562,9 +555,7 @@ namespace Trampolines
 
 			Append(&code[0],sizeof(::Trampolines::Bytecode::codePushParam));
 
-			TPRINT(("calledstack=%d+4\n",m_calledstack));
 			m_calledstack+=4; // increase auto detected stack size
-			TPRINT(("mystack=%d+4\n",m_mystack));
 			m_mystack+=4;
 
 		};
diff --git a/dlls/hamsandwich/call_funcs.cpp b/dlls/hamsandwich/call_funcs.cpp
index db434af4..adbaa86b 100644
--- a/dlls/hamsandwich/call_funcs.cpp
+++ b/dlls/hamsandwich/call_funcs.cpp
@@ -8,13 +8,6 @@
 #include "forward.h"
 #include "hook.h"
 
-#ifdef _WIN32
-#define LOL_CDECL __cdecl
-#else
-#define LOL_CDECL 
-#endif
-
-
 extern CVector<Hook *> hooks[HAM_LAST_ENTRY_DONT_USE_ME_LOL];
 
 void FailPlugin(AMX *amx, int id, int err, const char *reason);
@@ -58,7 +51,7 @@ inline void *GetFunction(void *pthis, int id)
 	void *pv=IndexToPrivate(id);
 
 
-cell LOL_CDECL Call_Void_Void(AMX *amx, cell *params)
+cell Call_Void_Void(AMX *amx, cell *params)
 {
 	SETUP(0);
 
@@ -70,7 +63,7 @@ cell LOL_CDECL Call_Void_Void(AMX *amx, cell *params)
 	return 1;
 }
 
-cell LOL_CDECL Call_Int_Void(AMX *amx, cell *params)
+cell Call_Int_Void(AMX *amx, cell *params)
 {
 	SETUP(0);
 
@@ -81,7 +74,7 @@ cell LOL_CDECL Call_Int_Void(AMX *amx, cell *params)
 #endif
 }
 
-cell LOL_CDECL Call_Void_Entvar(AMX *amx, cell *params)
+cell Call_Void_Entvar(AMX *amx, cell *params)
 {
 	SETUP(1);
 
@@ -100,7 +93,7 @@ cell LOL_CDECL Call_Void_Entvar(AMX *amx, cell *params)
 }
 
 
-cell LOL_CDECL Call_Void_Cbase(AMX *amx, cell *params)
+cell Call_Void_Cbase(AMX *amx, cell *params)
 {
 	SETUP(1);
 
@@ -118,7 +111,7 @@ cell LOL_CDECL Call_Void_Cbase(AMX *amx, cell *params)
 	return 1;
 }
 
-cell LOL_CDECL Call_Int_Float_Int(AMX *amx, cell *params)
+cell Call_Int_Float_Int(AMX *amx, cell *params)
 {
 	SETUP(2);
 
@@ -133,7 +126,7 @@ cell LOL_CDECL Call_Int_Float_Int(AMX *amx, cell *params)
 }
 
 	
-cell LOL_CDECL Call_Void_Entvar_Int(AMX *amx, cell *params)
+cell Call_Void_Entvar_Int(AMX *amx, cell *params)
 {
 	SETUP(2);
 
@@ -153,7 +146,7 @@ cell LOL_CDECL Call_Void_Entvar_Int(AMX *amx, cell *params)
 }
 
 
-cell LOL_CDECL Call_Int_Cbase(AMX *amx, cell *params)
+cell Call_Int_Cbase(AMX *amx, cell *params)
 {
 	SETUP(1);
 
@@ -170,7 +163,7 @@ cell LOL_CDECL Call_Int_Cbase(AMX *amx, cell *params)
 #endif
 }
 
-cell LOL_CDECL Call_Void_Int_Int(AMX *amx, cell *params)
+cell Call_Void_Int_Int(AMX *amx, cell *params)
 {
 	SETUP(2);
 
@@ -185,7 +178,7 @@ cell LOL_CDECL Call_Void_Int_Int(AMX *amx, cell *params)
 	return 1;
 }
 
-cell LOL_CDECL Call_Int_Int_Str_Int(AMX *amx, cell *params)
+cell Call_Int_Int_Str_Int(AMX *amx, cell *params)
 {
 	
 	SETUP(3);
@@ -201,7 +194,7 @@ cell LOL_CDECL Call_Int_Int_Str_Int(AMX *amx, cell *params)
 #endif
 }
 
-cell LOL_CDECL Call_Int_Int(AMX *amx, cell *params)
+cell Call_Int_Int(AMX *amx, cell *params)
 {
 	SETUP(1);
 
@@ -214,7 +207,7 @@ cell LOL_CDECL Call_Int_Int(AMX *amx, cell *params)
 #endif
 }
 
-cell LOL_CDECL Call_Int_Entvar(AMX *amx, cell *params)
+cell Call_Int_Entvar(AMX *amx, cell *params)
 {
 	SETUP(1);
 
@@ -231,7 +224,7 @@ cell LOL_CDECL Call_Int_Entvar(AMX *amx, cell *params)
 #endif
 }
 
-cell LOL_CDECL Call_Int_Entvar_Entvar_Float_Int(AMX *amx, cell *params)
+cell Call_Int_Entvar_Entvar_Float_Int(AMX *amx, cell *params)
 {
 	SETUP(4);
 
@@ -253,7 +246,7 @@ cell LOL_CDECL Call_Int_Entvar_Entvar_Float_Int(AMX *amx, cell *params)
 #endif
 }
 
-cell LOL_CDECL Call_Void_Int(AMX *amx, cell *params)
+cell Call_Void_Int(AMX *amx, cell *params)
 {
 	SETUP(1);
 
@@ -268,7 +261,7 @@ cell LOL_CDECL Call_Void_Int(AMX *amx, cell *params)
 	return 1;
 }
 
-cell LOL_CDECL Call_Void_Cbase_Cbase_Int_Float(AMX *amx, cell *params)
+cell Call_Void_Cbase_Cbase_Int_Float(AMX *amx, cell *params)
 {
 	SETUP(4);
 
@@ -292,7 +285,7 @@ cell LOL_CDECL Call_Void_Cbase_Cbase_Int_Float(AMX *amx, cell *params)
 	return 1;
 }
 
-cell LOL_CDECL Call_Void_Entvar_Float_Vector_Trace_Int(AMX *amx, cell *params)
+cell Call_Void_Entvar_Float_Vector_Trace_Int(AMX *amx, cell *params)
 {
 	SETUP(5);
 
@@ -326,7 +319,7 @@ cell LOL_CDECL Call_Void_Entvar_Float_Vector_Trace_Int(AMX *amx, cell *params)
 	return 1;
 }
 
-cell LOL_CDECL Call_Void_Float_Vector_TraceResult_Int(AMX *amx, cell *params)
+cell Call_Void_Float_Vector_TraceResult_Int(AMX *amx, cell *params)
 {
 	SETUP(4);
 
@@ -356,7 +349,7 @@ cell LOL_CDECL Call_Void_Float_Vector_TraceResult_Int(AMX *amx, cell *params)
 	return 1;
 }
 
-cell LOL_CDECL Call_Str_Void(AMX *amx, cell *params)
+cell Call_Str_Void(AMX *amx, cell *params)
 {
 	SETUP(2);
 
@@ -369,7 +362,7 @@ cell LOL_CDECL Call_Str_Void(AMX *amx, cell *params)
 
 }
 
-cell LOL_CDECL Call_Cbase_Void(AMX *amx, cell *params)
+cell Call_Cbase_Void(AMX *amx, cell *params)
 {
 	SETUP(0);
 #ifdef _WIN32
@@ -380,7 +373,7 @@ cell LOL_CDECL Call_Cbase_Void(AMX *amx, cell *params)
 	return PrivateToIndex(ret);
 }
 
-cell LOL_CDECL Call_Vector_Void(AMX *amx, cell *params)
+cell Call_Vector_Void(AMX *amx, cell *params)
 {
 	SETUP(1);
 #ifdef _WIN32
@@ -396,7 +389,7 @@ cell LOL_CDECL Call_Vector_Void(AMX *amx, cell *params)
 	return 1;
 }
 
-cell LOL_CDECL Call_Vector_pVector(AMX *amx, cell *params)
+cell Call_Vector_pVector(AMX *amx, cell *params)
 {
 	SETUP(2);
 
@@ -423,7 +416,7 @@ cell LOL_CDECL Call_Vector_pVector(AMX *amx, cell *params)
 	return 1;
 }
 
-cell LOL_CDECL Call_Int_pVector(AMX *amx, cell *params)
+cell Call_Int_pVector(AMX *amx, cell *params)
 {
 	SETUP(1);
 
@@ -446,7 +439,7 @@ cell LOL_CDECL Call_Int_pVector(AMX *amx, cell *params)
 	return ret;
 }
 
-cell LOL_CDECL Call_Void_Entvar_Float_Float(AMX *amx, cell *params)
+cell Call_Void_Entvar_Float_Float(AMX *amx, cell *params)
 {
 	SETUP(3);
 
@@ -467,7 +460,7 @@ cell LOL_CDECL Call_Void_Entvar_Float_Float(AMX *amx, cell *params)
 	return 1;
 }
 
-cell LOL_CDECL Call_Int_pFloat_pFloat(AMX *amx, cell *params)
+cell Call_Int_pFloat_pFloat(AMX *amx, cell *params)
 {
 	SETUP(2);
 
@@ -482,7 +475,7 @@ cell LOL_CDECL Call_Int_pFloat_pFloat(AMX *amx, cell *params)
 
 }
 
-cell LOL_CDECL Call_Void_Entvar_Float(AMX *amx, cell *params)
+cell Call_Void_Entvar_Float(AMX *amx, cell *params)
 {
 	SETUP(2);