diff --git a/d1x-rebirth/main/multi.c b/d1x-rebirth/main/multi.c
index 6cd1a6d4d..1b769cf5f 100644
--- a/d1x-rebirth/main/multi.c
+++ b/d1x-rebirth/main/multi.c
@@ -487,8 +487,7 @@ multi_make_player_ghost(int playernum)
 	obj->movement_type = MT_NONE;
 	multi_reset_player_object(obj);
 
-	if (Game_mode & GM_MULTI_ROBOTS)
-		multi_strip_robots(playernum);
+	multi_strip_robots(playernum);
 }
 
 void
@@ -1962,8 +1961,7 @@ multi_do_cloak(const ubyte *buf)
 	Players[pnum].cloak_time = GameTime64;
 	ai_do_cloak_stuff();
 
-	if (Game_mode & GM_MULTI_ROBOTS)
-		multi_strip_robots(pnum);
+	multi_strip_robots(pnum);
 
 	if (Newdemo_state == ND_STATE_RECORDING)
 		newdemo_record_multi_cloak(pnum);
@@ -2708,8 +2706,7 @@ multi_send_kill(int objnum)
 	else
 		multi_send_data_direct((ubyte*)multibuf, count, multi_who_is_master(), 2); // I am just a client so I'll only send my kill but not compute it, yet. I'll get response from host so I can compute it correctly
 
-	if (Game_mode & GM_MULTI_ROBOTS)
-		multi_strip_robots(Player_num);
+	multi_strip_robots(Player_num);
 
 	if (Game_mode & GM_BOUNTY && multi_i_am_master()) // update in case if needed... we could attach this to this packet but... meh...
 		multi_send_bounty();
@@ -2777,8 +2774,7 @@ multi_send_cloak(void)
 
 	multi_send_data(multibuf, 2, 2);
 
-	if (Game_mode & GM_MULTI_ROBOTS)
-		multi_strip_robots(Player_num);
+	multi_strip_robots(Player_num);
 }
 
 void
diff --git a/d2x-rebirth/main/multi.c b/d2x-rebirth/main/multi.c
index 2cf360154..fd9f1f25c 100644
--- a/d2x-rebirth/main/multi.c
+++ b/d2x-rebirth/main/multi.c
@@ -496,8 +496,7 @@ multi_make_player_ghost(int playernum)
 	obj->movement_type = MT_NONE;
 	multi_reset_player_object(obj);
 
-	if (Game_mode & GM_MULTI_ROBOTS)
-		multi_strip_robots(playernum);
+	multi_strip_robots(playernum);
 }
 
 void
@@ -2039,8 +2038,7 @@ multi_do_cloak(const ubyte *buf)
 	Players[pnum].cloak_time = GameTime64;
 	ai_do_cloak_stuff();
 
-	if (Game_mode & GM_MULTI_ROBOTS)
-		multi_strip_robots(pnum);
+	multi_strip_robots(pnum);
 
 	if (Newdemo_state == ND_STATE_RECORDING)
 		newdemo_record_multi_cloak(pnum);
@@ -2612,8 +2610,7 @@ multi_send_player_explode(char type)
 	multi_send_data(multibuf, message_length[MULTI_PLAYER_EXPLODE], 2);
 	if (Players[Player_num].flags & PLAYER_FLAGS_CLOAKED)
 		multi_send_decloak();
-	if (Game_mode & GM_MULTI_ROBOTS)
-		multi_strip_robots(Player_num);
+	multi_strip_robots(Player_num);
 }
 
 extern int Proximity_dropped, Smartmines_dropped;
@@ -2950,8 +2947,7 @@ multi_send_kill(int objnum)
 	else
 		multi_send_data_direct((ubyte*)multibuf, count, multi_who_is_master(), 2); // I am just a client so I'll only send my kill but not compute it, yet. I'll get response from host so I can compute it correctly
 
-	if (Game_mode & GM_MULTI_ROBOTS)
-		multi_strip_robots(Player_num);
+	multi_strip_robots(Player_num);
 
 	if (Game_mode & GM_BOUNTY && multi_i_am_master()) // update in case if needed... we could attach this to this packet but... meh...
 		multi_send_bounty();
@@ -3020,8 +3016,7 @@ multi_send_cloak(void)
 
 	multi_send_data(multibuf, 2, 2);
 
-	if (Game_mode & GM_MULTI_ROBOTS)
-		multi_strip_robots(Player_num);
+	multi_strip_robots(Player_num);
 }
 
 void