diff --git a/maps/map_files/golden_arrow/golden_arrow.dmm b/maps/map_files/golden_arrow/golden_arrow.dmm
index d7691b69b1..c4b61bcd30 100644
--- a/maps/map_files/golden_arrow/golden_arrow.dmm
+++ b/maps/map_files/golden_arrow/golden_arrow.dmm
@@ -3126,8 +3126,6 @@
 /obj/structure/closet/secure_closet/personal/cabinet{
 	req_access = null
 	},
-/obj/item/clothing/suit/storage/jacket/marine/service/tanker,
-/obj/item/clothing/suit/storage/jacket/marine/service,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
@@ -3389,10 +3387,10 @@
 /turf/closed/wall/almayer,
 /area/almayer/living/platoon_commander_rooms)
 "vc" = (
-/obj/structure/closet/radiation,
 /obj/structure/machinery/light{
 	dir = 1
 	},
+/obj/structure/closet/emcloset,
 /turf/open/floor/almayer{
 	icon_state = "test_floor5"
 	},
@@ -5570,15 +5568,6 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/alpha/squad_two)
-"IN" = (
-/obj/structure/closet/toolcloset,
-/obj/structure/machinery/light{
-	dir = 1
-	},
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/engineering)
 "IP" = (
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/engineering)
@@ -6424,7 +6413,7 @@
 	},
 /area/almayer/living/cryo_cells)
 "NZ" = (
-/obj/structure/closet/radiation,
+/obj/structure/closet/secure_closet/engineering_electrical,
 /turf/open/floor/almayer{
 	icon_state = "test_floor5"
 	},
@@ -6903,10 +6892,10 @@
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/living/cryo_cells)
 "Qz" = (
-/obj/structure/closet/radiation,
 /obj/structure/machinery/status_display{
 	pixel_y = 30
 	},
+/obj/structure/closet/firecloset/full,
 /turf/open/floor/almayer{
 	icon_state = "test_floor5"
 	},
@@ -21749,7 +21738,7 @@ DC
 RW
 mZ
 TN
-IN
+CX
 IP
 gf
 Bd