diff --git a/_maps/basemap.dm b/_maps/basemap.dm
index 914934686f3..6d5747fa5c4 100644
--- a/_maps/basemap.dm
+++ b/_maps/basemap.dm
@@ -1,7 +1,30 @@
 #ifndef ALL_MAPS
+
 #include "map_files\generic\SpaceStation.dmm"
 #include "map_files\generic\Centcomm.dmm"
 #include "map_files\generic\Space.dmm"
 #include "map_files\generic\SpaceDock.dmm"
 #include "map_files\Mining\lavaland.dmm"
+
+#else
+
+#include "map_files\debug\runtimestation.dmm"
+#include "map_files\Deltastation\DeltaStation2.dmm"
+#include "map_files\MetaStation\MetaStation.dmm"
+#include "map_files\OmegaStation\OmegaStation.dmm"
+#include "map_files\PubbyStation\PubbyStation.dmm"
+#include "map_files\TgStation\tgstation.2.1.3.dmm"
+#include "map_files\Cerestation\cerestation.dmm"
+
+#include "map_files\generic\Centcomm.dmm"
+#include "map_files\generic\SpaceStation.dmm"
+#include "map_files\generic\Space.dmm"
+#include "map_files\generic\SpaceDock.dmm"
+
+#include "map_files\Mining\Lavaland.dmm"
+
+#ifdef TRAVISBUILDING
+#include "templates.dm"
+#endif
+
 #endif
\ No newline at end of file
diff --git a/_maps/loadallmaps.dm b/_maps/loadallmaps.dm
deleted file mode 100644
index 989197f84d4..00000000000
--- a/_maps/loadallmaps.dm
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifdef ALL_MAPS
-#include "map_files\debug\runtimestation.dmm"
-#include "map_files\Deltastation\DeltaStation2.dmm"
-#include "map_files\MetaStation\MetaStation.dmm"
-#include "map_files\OmegaStation\OmegaStation.dmm"
-#include "map_files\PubbyStation\PubbyStation.dmm"
-#include "map_files\TgStation\tgstation.2.1.3.dmm"
-#include "map_files\Cerestation\cerestation.dmm"
-
-#include "map_files\generic\Centcomm.dmm"
-#include "map_files\generic\SpaceStation.dmm"
-#include "map_files\generic\Space.dmm"
-#include "map_files\generic\SpaceDock.dmm"
-
-#include "map_files\Mining\Lavaland.dmm"
-
-#ifdef TRAVISBUILDING
-#include "templates.dm"
-#endif
-#endif
\ No newline at end of file
diff --git a/tgstation.dme b/tgstation.dme
index 60b4a72758c..8459c6bcc9f 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -14,7 +14,6 @@
 
 // BEGIN_INCLUDE
 #include "_maps\basemap.dm"
-#include "_maps\loadallmaps.dm"
 #include "code\_compile_options.dm"
 #include "code\world.dm"
 #include "code\__DATASTRUCTURES\globals.dm"