diff --git a/code/_onclick/hud/human.dm b/code/_onclick/hud/human.dm
index aa9da33ca78..0c36b29db06 100644
--- a/code/_onclick/hud/human.dm
+++ b/code/_onclick/hud/human.dm
@@ -46,59 +46,7 @@
 	src.adding += using
 	action_intent = using
 
-//intent small hud objects
-/*	var/icon/ico
 
-	ico = new(ui_style, "black")
-	ico.MapColors(0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, -1,-1,-1,-1)
-	ico.DrawBox(rgb(255,255,255,1),1,ico.Height()/2,ico.Width()/2,ico.Height())
-	using = new /obj/screen( src )
-	using.name = "help"
-	using.icon = ico
-	using.screen_loc = ui_acti
-	using.alpha = ui_alpha
-	using.layer = 21
-	src.adding += using
-	help_intent = using
-
-	ico = new(ui_style, "black")
-	ico.MapColors(0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, -1,-1,-1,-1)
-	ico.DrawBox(rgb(255,255,255,1),ico.Width()/2,ico.Height()/2,ico.Width(),ico.Height())
-	using = new /obj/screen( src )
-	using.name = "disarm"
-	using.icon = ico
-	using.screen_loc = ui_acti
-	using.alpha = ui_alpha
-	using.layer = 21
-	src.adding += using
-	disarm_intent = using
-
-	ico = new(ui_style, "black")
-	ico.MapColors(0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, -1,-1,-1,-1)
-	ico.DrawBox(rgb(255,255,255,1),ico.Width()/2,1,ico.Width(),ico.Height()/2)
-	using = new /obj/screen( src )
-	using.name = "grab"
-	using.icon = ico
-	using.screen_loc = ui_acti
-	using.alpha = ui_alpha
-	using.layer = 21
-	src.adding += using
-	grab_intent = using
-
-	ico = new(ui_style, "black")
-	ico.MapColors(0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, -1,-1,-1,-1)
-	ico.DrawBox(rgb(255,255,255,1),1,1,ico.Width()/2,ico.Height()/2)
-	using = new /obj/screen( src )
-	using.name = "harm"
-	using.icon = ico
-	using.screen_loc = ui_acti
-	using.alpha = ui_alpha
-	using.layer = 21
-	src.adding += using
-	hurt_intent = using
-*/
-
-//end intent small hud objects
 
 	using = new /obj/screen/mov_intent()
 	using.name = "mov_intent"
diff --git a/code/_onclick/hud/robot.dm b/code/_onclick/hud/robot.dm
index bfde0049cbd..78ee883960c 100644
--- a/code/_onclick/hud/robot.dm
+++ b/code/_onclick/hud/robot.dm
@@ -232,15 +232,16 @@
 
 	//Handle the gun settings buttons
 	mymob.gun_setting_icon = new /obj/screen/gun/mode(null)
-	if (mymob.client)
-		if (mymob.client.gun_mode) // If in aim mode, correct the sprite
-			mymob.gun_setting_icon.dir = 2
-	for(var/obj/item/weapon/gun/G in mymob) // If targeting someone, display other buttons
-		if (G.target)
-			mymob.item_use_icon = new /obj/screen/gun/item(null)
-			if (mymob.client.target_can_click)
-				mymob.item_use_icon.dir = 1
-			src.adding += mymob.item_use_icon
+	mymob.item_use_icon = new /obj/screen/gun/item(null)
+	//if (mymob.client)
+	//	if (mymob.client.gun_mode) // If in aim mode, correct the sprite
+	//		mymob.gun_setting_icon.dir = 2
+	//for(var/obj/item/weapon/gun/G in mymob) // If targeting someone, display other buttons
+	//	if (G.target)
+	//		mymob.item_use_icon = new /obj/screen/gun/item(null)
+	//		if (mymob.client.target_can_click)
+	//			mymob.item_use_icon.dir = 1
+			//src.adding += mymob.item_use_icon
 			/*mymob.gun_move_icon = new /obj/screen/gun/move(null)
 			if (mymob.client.target_can_move)
 				mymob.gun_move_icon.dir = 1
diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm
index d06ae59ab87..68ed970a55d 100644
--- a/code/_onclick/hud/screen_objects.dm
+++ b/code/_onclick/hud/screen_objects.dm
@@ -369,11 +369,11 @@
 /obj/screen/gun/item/Click()
 	if(gun_click_time > world.time - 30)	//give them 3 seconds between mode changes.
 		return
-		if(!istype(usr.get_active_hand(), /obj/item/weapon/gun))
-			usr << "You need your gun in your active hand to do that!"
-			return
-		usr.client.AllowTargetClick()
-		gun_click_time = world.time
+	if(!istype(usr.get_active_hand(), /obj/item/weapon/gun))
+		usr << "You need your gun in your active hand to do that!"
+		return
+	usr.client.AllowTargetClick()
+	gun_click_time = world.time
 
 
 /obj/screen/inventory/Click()