diff --git a/code/game/objects/alien/facehugger.dm b/code/game/objects/alien/facehugger.dm
index 25d304f47eb..1f413f5e996 100644
--- a/code/game/objects/alien/facehugger.dm
+++ b/code/game/objects/alien/facehugger.dm
@@ -187,11 +187,11 @@ var/const/MAX_ACTIVE_TIME = 600
 
 		stat = CONSCIOUS
 
-		for(var/mob/living/carbon/alien/alien in world)
+/*		for(var/mob/living/carbon/alien/alien in world)
 			var/image/activeIndicator = image('alien.dmi', loc = src, icon_state = "facehugger_active")
 			activeIndicator.override = 1
 			if(alien && alien.client)
-				alien.client.images += activeIndicator
+				alien.client.images += activeIndicator	*/
 
 		spawn(rand(MIN_ACTIVE_TIME,MAX_ACTIVE_TIME))
 			GoIdle()
@@ -202,7 +202,7 @@ var/const/MAX_ACTIVE_TIME = 600
 		if(stat == DEAD || stat == UNCONSCIOUS)
 			return
 
-		RemoveActiveIndicators()
+/*		RemoveActiveIndicators()	*/
 
 		stat = UNCONSCIOUS
 
@@ -212,7 +212,7 @@ var/const/MAX_ACTIVE_TIME = 600
 		if(stat == DEAD)
 			return
 
-		RemoveActiveIndicators()
+/*		RemoveActiveIndicators()	*/
 
 		icon_state = "facehugger_dead"
 		stat = DEAD
@@ -222,14 +222,14 @@ var/const/MAX_ACTIVE_TIME = 600
 
 		return
 
-	proc/RemoveActiveIndicators() //removes the "active" facehugger indicator from all aliens in the world for this hugger
+/*	proc/RemoveActiveIndicators() //removes the "active" facehugger indicator from all aliens in the world for this hugger
 		for(var/mob/living/carbon/alien/alien in world)
 			if(alien.client)
 				for(var/image/image in alien.client.images)
 					if(image.icon_state == "facehugger_active" && image.loc == src)
 						del(image)
 
-		return
+		return	*/
 
 /obj/item/clothing/mask/facehugger/angry
 	stat = CONSCIOUS
diff --git a/code/game/objects/watercloset.dm b/code/game/objects/watercloset.dm
index 1163a60c438..b6b51fb35ef 100644
--- a/code/game/objects/watercloset.dm
+++ b/code/game/objects/watercloset.dm
@@ -29,9 +29,7 @@
 		else
 			var/obj/item/I = pick(contents)
 			if(ishuman(user))
-				if(!user.get_active_hand())
-					I.loc = user.loc
-					user.put_in_hands(I)
+				user.put_in_hands(I)
 			else
 				I.loc = get_turf(src)
 			user << "<span class='notice'>You find \an [I] in the cistern.</span>"