diff --git a/_maps/__MAP_DEFINES.dm b/_maps/__MAP_DEFINES.dm
deleted file mode 100644
index e1e113a290..0000000000
--- a/_maps/__MAP_DEFINES.dm
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-The /tg/ codebase currently requires you to have 11 z-levels of the same size dimensions.
-z-level order is important, the order you put them in inside the map config.dm will determine what z level number they are assigned ingame.
-Names of z-level do not matter, but order does greatly, for instances such as checking alive status of revheads on z1
-
-current as of 2016/6/2
-z1 = station
-z2 = centcomm
-z5 = mining
-Everything else = randomized space
-Last space-z level = empty
-*/
-
-#define CROSSLINKED 2
-#define SELFLOOPING 1
-#define UNAFFECTED 0
-
-#define MAIN_STATION "Main Station"
-#define CENTCOMM "CentComm"
-#define EMPTY_AREA_1 "Empty Area 1"
-#define EMPTY_AREA_2 "Empty Area 2"
-#define MINING "Mining Asteroid"
-#define EMPTY_AREA_3 "Empty Area 3"
-#define EMPTY_AREA_4 "Empty Area 4"
-#define EMPTY_AREA_5 "Empty Area 5"
-#define EMPTY_AREA_6 "Empty Area 6"
-#define EMPTY_AREA_7 "Empty Area 7"
-#define EMPTY_AREA_8 "Empty Area 8"
-#define AWAY_MISSION "Away Mission"
-#define AWAY_MISSION_LIST list(AWAY_MISSION = SELFLOOPING)
-#define DEFAULT_MAP_TRANSITION_CONFIG list(MAIN_STATION = CROSSLINKED, CENTCOMM = SELFLOOPING, EMPTY_AREA_1 = CROSSLINKED, EMPTY_AREA_2 = CROSSLINKED, MINING = SELFLOOPING, EMPTY_AREA_3 = CROSSLINKED, EMPTY_AREA_4 = CROSSLINKED, EMPTY_AREA_5 = CROSSLINKED, EMPTY_AREA_6 = CROSSLINKED, EMPTY_AREA_7 = CROSSLINKED, EMPTY_AREA_8 = CROSSLINKED)
diff --git a/_maps/basemap.dm b/_maps/basemap.dm
index 198c7e74a2..20396b128a 100644
--- a/_maps/basemap.dm
+++ b/_maps/basemap.dm
@@ -4,7 +4,7 @@
 #include "map_files\generic\SpaceStation.dmm"
 #include "map_files\generic\Space.dmm"
 #include "map_files\generic\SpaceDock.dmm"
-#include "map_files\Mining\lavaland.dmm"
+#include "map_files\Mining\Lavaland.dmm"
 
 #else
 
diff --git a/_maps/loadallmaps.dm b/_maps/loadallmaps.dm
deleted file mode 100644
index 22359d164f..0000000000
--- a/_maps/loadallmaps.dm
+++ /dev/null
@@ -1,21 +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\CitadelStation\CitadelStation-1.2.1.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/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm
index 6dde8e6b2d..9c2f3d2845 100644
--- a/code/controllers/subsystem/mapping.dm
+++ b/code/controllers/subsystem/mapping.dm
@@ -119,7 +119,9 @@ SUBSYSTEM_DEF(mapping)
 	INIT_ANNOUNCE("Loading [config.map_name]...")
 	TryLoadZ(config.GetFullMapPath(), FailedZs, ZLEVEL_STATION)
 	INIT_ANNOUNCE("Loaded station in [(REALTIMEOFDAY - start_time)/10]s!")
-	SSblackbox.add_details("map_name", config.map_name)
+	if(SSdbcore.Connect())
+		var/datum/DBQuery/query_round_map_name = SSdbcore.NewQuery("UPDATE [format_table_name("round")] SET map_name = '[config.map_name]' WHERE id = [GLOB.round_id]")
+		query_round_map_name.Execute()
 
 	if(config.minetype != "lavaland")
 		INIT_ANNOUNCE("WARNING: A map without lavaland set as it's minetype was loaded! This is being ignored! Update the maploader code!")
diff --git a/tgstation.dme b/tgstation.dme
index 7c1d803849..a704d5f073 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -14,7 +14,6 @@
 
 // BEGIN_INCLUDE
 #include "_maps\basemap.dm"
-#include "_maps\tgstation2.dm"
 #include "code\_compile_options.dm"
 #include "code\world.dm"
 #include "code\__DATASTRUCTURES\globals.dm"