diff --git a/hyperstation/code/game/turfs/simulated/wall/mineral_walls.dm b/hyperstation/code/game/turfs/simulated/wall/mineral_walls.dm
index c756305bf..88918b722 100644
--- a/hyperstation/code/game/turfs/simulated/wall/mineral_walls.dm
+++ b/hyperstation/code/game/turfs/simulated/wall/mineral_walls.dm
@@ -5,30 +5,17 @@
 	icon_state = "amogus"
 	explosion_block = 10
 	smooth = SMOOTH_FALSE
+	canSmoothWith = null
 
-/obj/structure/window/shuttle/custom //For custom shuttle windows and parts that are small
-	name = "whoops!"
-	desc = "Scream at Dahl please!"
-	icon = 'hyperstation/icons/turf/walls/customshuttles.dmi'
-	icon_state = "amogus"
-	dir = FULLTILE_WINDOW_DIR
-	max_integrity = 100
-	wtype = "shuttle"
-	fulltile = TRUE
-	flags_1 = PREVENT_CLICK_UNDER_1
-	reinf = TRUE
-	heat_resistance = 1600
-	armor = list("melee" = 50, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 100)
-	smooth = SMOOTH_FALSE
-	explosion_block = 10
-	anchored = TRUE
+/turf/closed/wall/mineral/titanium/custom/window
+	opacity = FALSE
 
 /turf/closed/wall/mineral/titanium/custom/ferry
 	name = "\improper ferry wall"
 	desc = "A low tech hull for Layenia flight."
 	icon_state = "ferry"
 
-/obj/structure/window/shuttle/custom/ferry
+/obj/structure/window/shuttle/custom/window/ferry
 	name = "\improper ferry wall"
 	desc = "A low tech hull for Layenia flight."
 	icon_state = "ferry"