diff --git a/code/game/machinery/gateway.dm b/code/game/machinery/gateway.dm
deleted file mode 100644
index 6abf46ac934..00000000000
--- a/code/game/machinery/gateway.dm
+++ /dev/null
@@ -1,49 +0,0 @@
-/obj/structure/gatewayplaceholder
-	density = 1
-	anchored = 1
-	icon = 'icons/obj/machines/gateway.dmi'
-
-/obj/structure/gatewayplaceholder/one
-	name = "Gateway"
-	desc = "A gateway"
-	icon_state = "off1"
-
-/obj/structure/gatewayplaceholder/two
-	name = "Gateway"
-	desc = "A gateway"
-	icon_state = "off2"
-
-/obj/structure/gatewayplaceholder/three
-	name = "Gateway"
-	desc = "A gateway"
-	icon_state = "off3"
-
-/obj/structure/gatewayplaceholder/four
-	name = "Gateway"
-	desc = "A gateway"
-	icon_state = "off4"
-
-/obj/structure/gatewayplaceholder/five
-	name = "Gateway"
-	desc = "A gateway"
-	icon_state = "off5"
-
-/obj/structure/gatewayplaceholder/six
-	name = "Gateway"
-	desc = "A gateway"
-	icon_state = "off6"
-
-/obj/structure/gatewayplaceholder/seven
-	name = "Gateway"
-	desc = "A gateway"
-	icon_state = "off7"
-
-/obj/structure/gatewayplaceholder/eight
-	name = "Gateway"
-	desc = "A gateway"
-	icon_state = "off8"
-
-/obj/structure/gatewayplaceholder/nine
-	name = "Gateway"
-	desc = "A gateway"
-	icon_state = "off9"
\ No newline at end of file
diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm
index 043d20f7e7a..f8dc610addf 100644
--- a/code/modules/awaymissions/gateway.dm
+++ b/code/modules/awaymissions/gateway.dm
@@ -76,12 +76,13 @@ obj/machinery/gateway/centerstation/process()
 	if(!ready) return
 	if(linked.len != 8) return
 	if(!powered()) return
-	if(world.time < wait)
-		user << "<span class='notice'>Error: Warpspace triangulation in progress. Estimated time to completion: [round(((wait - world.time) / 10) / 60)] minutes.</span>"
-		return
 	if(awaygate == null)
 		user << "<span class='notice'>Error: No destination found.</span>"
 		return
+	if(world.time < wait)
+		user << "<span class='notice'>Error: Warpspace triangulation in progress. Estimated time to completion: [round(((wait - world.time) / 10) / 60)] minutes.</span>"
+		return
+
 
 	for(var/obj/machinery/gateway/G in linked)
 		G.active = 1
diff --git a/tgstation.dme b/tgstation.dme
index d6d622cbec1..22a4387fbc4 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -59,10 +59,6 @@
 #define FILE_DIR "code/game/mecha/medical"
 #define FILE_DIR "code/game/mecha/working"
 #define FILE_DIR "code/game/objects"
-#define FILE_DIR "code/game/objects/alien"
-#define FILE_DIR "code/game/objects/closets"
-#define FILE_DIR "code/game/objects/devices"
-#define FILE_DIR "code/game/objects/devices/PDA"
 #define FILE_DIR "code/game/objects/effects"
 #define FILE_DIR "code/game/objects/effects/decals"
 #define FILE_DIR "code/game/objects/effects/decals/Cleanable"
@@ -81,7 +77,6 @@
 #define FILE_DIR "code/game/objects/items/weapons/secstorage"
 #define FILE_DIR "code/game/objects/items/weapons/storage"
 #define FILE_DIR "code/game/objects/items/weapons/tanks"
-#define FILE_DIR "code/game/objects/storage"
 #define FILE_DIR "code/game/objects/structures"
 #define FILE_DIR "code/game/objects/structures/crates_lockers"
 #define FILE_DIR "code/game/objects/structures/crates_lockers/closets"
@@ -459,7 +454,6 @@
 #include "code\game\machinery\doppler_array.dm"
 #include "code\game\machinery\flasher.dm"
 #include "code\game\machinery\Freezer.dm"
-#include "code\game\machinery\gateway.dm"
 #include "code\game\machinery\hologram.dm"
 #include "code\game\machinery\hydroponics.dm"
 #include "code\game\machinery\igniter.dm"
@@ -1253,4 +1247,5 @@
 #include "interface\interface.dm"
 #include "interface\skin.dmf"
 #include "maps\tgstation.2.0.9.dmm"
+#include "maps\RandomZLevels\stationCollision.dm"
 // END_INCLUDE