diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm
index 7d75d8ae016..1447be96d4f 100644
--- a/code/game/machinery/computer/HolodeckControl.dm
+++ b/code/game/machinery/computer/HolodeckControl.dm
@@ -353,30 +353,15 @@
 	// HOLOFLOOR DOES NOT GIVE A FUCK
 
 /obj/structure/table/holotable
-	name = "table"
-
-/obj/structure/table/holotable/attack_alien(mob/user as mob)
-	return attack_hand(user)
-
-/obj/structure/table/holotable/attack_animal(mob/living/simple_animal/user as mob)
-	return attack_hand(user)
-
-/obj/structure/table/holotable/attack_hand(mob/user as mob)
-	return // HOLOTABLE DOES NOT GIVE A FUCK
-
-/obj/structure/table/holotable/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
-	if(istype(W, /obj/item/weapon/grab))
-		return ..()
-
-	if(istype(W, /obj/item/weapon/wrench))
-		to_chat(user, "<span class='warning'>It's a holotable! There are no bolts!</span>")
-		return
+	can_deconstruct = FALSE
+	canSmoothWith = list(/obj/structure/table/holotable)
 
 /obj/structure/table/holotable/wood
-	name = "table"
+	name = "wooden table"
 	desc = "A square piece of wood standing on four wooden legs. It can not move."
-	icon = 'icons/obj/structures.dmi'
+	icon = 'icons/obj/smooth_structures/wood_table.dmi'
 	icon_state = "wood_table"
+	canSmoothWith = list(/obj/structure/table/holotable/wood)
 
 /obj/item/clothing/gloves/boxing/hologlove
 	name = "boxing gloves"
@@ -396,21 +381,7 @@
 	flags = ON_BORDER
 
 /obj/structure/rack/holorack
-	name = "rack"
-
-/obj/structure/rack/holorack/attack_alien(mob/user as mob)
-	return attack_hand(user)
-
-/obj/structure/rack/holorack/attack_animal(mob/living/simple_animal/user as mob)
-	return attack_hand(user)
-
-/obj/structure/rack/holorack/attack_hand(mob/user as mob)
-	return // HOLORACK DOES NOT GIVE A FUCK
-
-/obj/structure/rack/holorack/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
-	if(istype(W, /obj/item/weapon/wrench))
-		to_chat(user, "<span class='warning'>It's a holorack! There are no bolts!</span>")
-		return
+	can_deconstruct = FALSE
 
 /obj/item/weapon/holo
 	damtype = STAMINA