diff --git a/code/controllers/master_controller.dm b/code/controllers/master_controller.dm
index 3ad2acefb4c..f565f6235f1 100644
--- a/code/controllers/master_controller.dm
+++ b/code/controllers/master_controller.dm
@@ -61,8 +61,7 @@ calculate the longest number of ticks the MC can wait between each cycle without
 	for(var/datum/subsystem/S in subsystems)
 		S.Initialize(world.timeofday, zlevel)
 		sleep(-1)
-	for(var/datum/subsystem/S in subsystems)
-		S.AfterInitialize(zlevel)
+
 	world << "<span class='boldannounce'>Initializations complete</span>"
 	world.log << "Initializations complete"
 
diff --git a/code/controllers/subsystem/air.dm b/code/controllers/subsystem/air.dm
index 99d0dc22d54..ec3a53d1647 100644
--- a/code/controllers/subsystem/air.dm
+++ b/code/controllers/subsystem/air.dm
@@ -2,7 +2,7 @@ var/datum/subsystem/air/SSair
 
 /datum/subsystem/air
 	name = "Air"
-	priority = 20
+	priority = -3
 	wait = 5
 	dynamic_wait = 1
 	dwait_upper = 50
@@ -55,10 +55,9 @@ var/datum/subsystem/air/SSair
 
 /datum/subsystem/air/Initialize(timeofday, zlevel)
 	setup_atmos_machinery(zlevel)
-	..()
-
-/datum/subsystem/air/AfterInitialize(zlevel)
 	setup_allturfs(zlevel)
+	setup_pipenets(zlevel)
+	..()
 
 #define MC_AVERAGE(average, current) (0.8*(average) + 0.2*(current))
 /datum/subsystem/air/fire()
diff --git a/code/controllers/subsystems.dm b/code/controllers/subsystems.dm
index ed81dda8652..f84c0ab8cb8 100644
--- a/code/controllers/subsystems.dm
+++ b/code/controllers/subsystems.dm
@@ -44,9 +44,6 @@
 	world << "<span class='boldannounce'>[msg]</span>"
 	world.log << msg
 
-/datum/subsystem/proc/AfterInitialize()
-	return
-
 //hook for printing stats to the "MC" statuspanel for admins to see performance and related stats etc.
 /datum/subsystem/proc/stat_entry(msg)
 	var/dwait = ""