diff --git a/code/game/machinery/frame.dm b/code/game/machinery/frame.dm
index b4fa7a68382..f913ba8a2a4 100644
--- a/code/game/machinery/frame.dm
+++ b/code/game/machinery/frame.dm
@@ -432,6 +432,12 @@
 				circuit.construct(B)
 				circuit.loc = null
 				B.circuit = circuit
+				var/obj/machinery/computer/LC = locate() in get_step(B, turn(B.dir, 90))
+				var/obj/machinery/computer/RC = locate() in get_step(B, turn(B.dir, -90))
+				if(LC)
+					LC.update_icon()
+				if(RC)
+					RC.update_icon()
 				qdel(src)
 				return
 
@@ -445,15 +451,7 @@
 				circuit.construct(B)
 				circuit.loc = null
 				B.circuit = circuit
-
 				B.update_icon()
-				var/obj/machinery/computer/LC = locate() in get_step(B, turn(B.dir, 90))
-				var/obj/machinery/computer/RC = locate() in get_step(B, turn(B.dir, -90))
-				if(LC)
-					LC.update_icon()
-				if(RC)
-					RC.update_icon()
-
 				qdel(src)
 				return
 
diff --git a/code/modules/projectiles/guns/projectile/shotgun_vr.dm b/code/modules/projectiles/guns/projectile/shotgun_vr.dm
index 7d024a9b8f0..17948831870 100644
--- a/code/modules/projectiles/guns/projectile/shotgun_vr.dm
+++ b/code/modules/projectiles/guns/projectile/shotgun_vr.dm
@@ -84,16 +84,6 @@
 	else
 		to_chat(usr, span_notice("You cannot do this in your current state."))
 
-
-/obj/item/gun/projectile/shotgun/compact/attack_self(mob/user)
-	if(issilicon(user))
-		return
-
-	if (isliving(user))
-		toggle_stock()
-	else
-		to_chat(user, span_notice("You cannot do this in your current state."))
-
 /obj/item/gun/projectile/shotgun/compact/ui_action_click(mob/unused_user, actiontype)
 	var/mob/living/user = loc
 	if(!isliving(user))