diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm
index fefc82c4b9f..0b9e87891d8 100644
--- a/code/modules/clothing/spacesuits/rig/rig.dm
+++ b/code/modules/clothing/spacesuits/rig/rig.dm
@@ -714,7 +714,7 @@
 			wearer = M
 			wearer.wearing_rig = src
 			if(has_emergency_release)
-			 M.verbs |= /obj/item/weapon/rig/proc/emergency_release
+				M.verbs |= /obj/item/weapon/rig/proc/emergency_release
 			update_icon()
 
 /obj/item/weapon/rig/proc/toggle_piece(var/piece, var/mob/living/user, var/deploy_mode, var/force)
@@ -772,8 +772,6 @@
 			if(to_strip)
 				to_strip.unEquip(use_obj, 1)
 
-			//use_obj.flags &= ~NODROP
-			//Why would we want to make it able to remove the piece per hand?
 			use_obj.forceMove(src)
 			if(wearer)
 				to_chat(wearer, "<span class='notice'>Your [use_obj] [use_obj.gender == PLURAL ? "retract" : "retracts"] swiftly.")
@@ -783,15 +781,11 @@
 				to_chat(wearer, "<span class='danger'>You are unable to deploy \the [piece] as \the [check_slot] [check_slot.gender == PLURAL ? "are" : "is"] in the way.</span>")
 				return
 			use_obj.forceMove(wearer)
-			//use_obj.flags &= ~NODROP
-			//Why would we want to make it able to remove the piece per hand?
 			if(!wearer.equip_to_slot_if_possible(use_obj, equip_to, 0, 1))
 				use_obj.forceMove(src)
 			else
 				if(wearer)
 					to_chat(wearer, "<span class='notice'>Your [use_obj.name] [use_obj.gender == PLURAL ? "deploy" : "deploys"] swiftly.</span>")
-				//use_obj.flags |= NODROP
-				//Parts should be inherently NODROP now, so if we don't remove the flag, we don't need to add it.
 
 	if(piece == "helmet" && helmet)
 		helmet.update_light(wearer)