diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm
index 90b3cb2be9d..0d060d3784c 100644
--- a/code/game/objects/structures.dm
+++ b/code/game/objects/structures.dm
@@ -38,6 +38,10 @@
 /obj/structure/attack_hand(mob/user)
 	. = ..()
 	add_fingerprint(user)
+	if(structureclimber && structureclimber != user)
+		user.changeNext_move(CLICK_CD_MELEE)
+		structureclimber.Weaken(2)
+		structureclimber.visible_message("<span class='warning'>[structureclimber.name] has been knocked off the [src]", "You're knocked off the [src]!", "You see [structureclimber.name] get knocked off the [src]</span>")
 	interact(user)
 
 /obj/structure/interact(mob/user)
@@ -92,23 +96,3 @@
 			return 1
 	structureclimber = null
 	return ..()
-
-
-/obj/structure/table/attack_hand(mob/living/user)
-	. = ..()
-
-	if(structureclimber && structureclimber != user)
-		user.changeNext_move(CLICK_CD_MELEE)
-		structureclimber.Weaken(2)
-		structureclimber.visible_message("<span class='warning'>[structureclimber.name] has been knocked off the [src]", "You're knocked off the [src]!", "You see [structureclimber.name] get knocked off the [src]</span>")
-
-
-/obj/structure/CanPass(atom/movable/mover, turf/target, height=0)
-	if(height==0)
-		return 1
-	else
-		return !density
-
-
-obj/structure/CanAStarPass(ID,dir,caller)
-	. = !density