diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm
index c53f45a336..af8c3eda2c 100644
--- a/code/modules/mob/dead/new_player/new_player.dm
+++ b/code/modules/mob/dead/new_player/new_player.dm
@@ -762,9 +762,8 @@
 
 		client.prefs.scars_list["[cur_scar_index]"] = valid_scars
 		client.prefs.save_character()
-	var/is_antag
 	if(mind in GLOB.pre_setup_antags)
-		is_antag = TRUE
+		var/is_antag = TRUE
 	
 	client.prefs.copy_to(H, initial_spawn = TRUE)
 	H.dna.update_dna_identity()
diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm
index 3eaefebc56..67a95006ab 100644
--- a/code/modules/mob/inventory.dm
+++ b/code/modules/mob/inventory.dm
@@ -414,10 +414,6 @@
 	drop_all_held_items()
 
 /obj/item/proc/equip_to_best_slot(mob/M)
-	if(src != M.get_active_held_item())
-		to_chat(M, "<span class='warning'>You are not holding anything to equip!</span>")
-		return FALSE
-
 	if(M.equip_to_appropriate_slot(src, TRUE))
 		M.update_inv_hands()
 		return TRUE