diff --git a/iw5/scripts/mp/_jump.gsc b/iw5/scripts/mp/_jump.gsc
index 29d565e..6834193 100644
--- a/iw5/scripts/mp/_jump.gsc
+++ b/iw5/scripts/mp/_jump.gsc
@@ -14,19 +14,10 @@ GENERIC_INIT;
 
 _ON_PLAYER_CNCT_BEGIN
 
-#if defined(TOOL)
-		waittillframeend;
-#endif
-
 		BOT_CHK( player );
 
-#if defined(TOOL)
-		player notifyOnPlayerCommand( "save_pos", "+reload" );
-		player notifyOnPlayerCommand( "load_saved_pos", "+activate" );
-#else
 		PLAYER_NOTIFY_CMD( player, "save_pos", "+reload" );
 		PLAYER_NOTIFY_CMD( player, "load_saved_pos", "+activate" );
-#endif
 
 		player thread jumper();
 		player thread displaySpeed();
diff --git a/iw5/scripts/mp/_utility.gsh b/iw5/scripts/mp/_utility.gsh
index 0506e39..a7e5372 100644
--- a/iw5/scripts/mp/_utility.gsh
+++ b/iw5/scripts/mp/_utility.gsh
@@ -135,14 +135,12 @@
 	#define WAIT_ANY_RET(ent, ...) ent waittill_any_return( __VA_ARGS__ )
 #endif
 
-#if !defined(TOOL)
-	#define PLAYER_NOTIFY_CMD(ent, str, action) ent notifyOnPlayerCommand( str, action )
-#endif
+#define PLAYER_NOTIFY_CMD(ent, str, action) ent notifyOnPlayerCommand( str, action )
 
 /* Tweak as necessary. Can be return, continue or break  */
 #define CHK_ACTION continue
 
-#if (defined(IW4MP) || defined(IW5x) || defined(IW5)) && !defined(TOOL)
+#if (defined(IW4MP) || defined(IW5x) || defined(IW5))
 #define BOT_CHK(ent) \
 	if ( ent isTestClient() ) \
 	{ \