diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm
index 295aa9239c..c7778af8fe 100644
--- a/code/game/objects/structures/lattice.dm
+++ b/code/game/objects/structures/lattice.dm
@@ -18,6 +18,7 @@
 		if(LAT != src)
 			crash_with("Found multiple lattices at '[log_info_line(loc)]'")
 			return INITIALIZE_HINT_QDEL
+
 	icon = 'icons/obj/smoothlattice.dmi'
 	icon_state = "latticeblank"
 	updateOverlays()
diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm
index 18d74c1eee..e9f37c8836 100644
--- a/code/game/turfs/simulated/floor.dm
+++ b/code/game/turfs/simulated/floor.dm
@@ -48,6 +48,9 @@
 		if(prob(dirty_prob))
 			dirt += rand(50,100)
 			update_dirt() //5% chance to start with dirt on a floor tile- give the janitor something to do
+	if(!mapload)
+		for(var/obj/structure/lattice/L in src)
+			qdel(L)
 
 /turf/simulated/floor/LateInitialize()
 	. = ..()
diff --git a/code/game/turfs/turf_changing.dm b/code/game/turfs/turf_changing.dm
index 0ceb0226d8..eb3ca5ad00 100644
--- a/code/game/turfs/turf_changing.dm
+++ b/code/game/turfs/turf_changing.dm
@@ -3,12 +3,6 @@
 	spawn()
 		new /obj/structure/lattice( locate(src.x, src.y, src.z) )
 
-// Removes all signs of lattice on the pos of the turf -Donkieyo
-/turf/proc/RemoveLattice()
-	var/obj/structure/lattice/L = locate(/obj/structure/lattice, src)
-	if(L)
-		qdel(L)
-
 // Called after turf replaces old one
 /turf/proc/post_change()
 	levelupdate()
@@ -44,12 +38,11 @@
 	qdel(src)
 
 	var/turf/W = new N( locate(src.x, src.y, src.z) )
-	if(istype(W, /turf/simulated/floor))
-		if(old_fire)
+	if(old_fire)
+		if(istype(W, /turf/simulated/floor))
 			W.fire = old_fire
-		W.RemoveLattice()
-	else if(old_fire)
-		old_fire.RemoveFire()
+		else
+			old_fire.RemoveFire()
 
 	if(tell_universe)
 		universe.OnTurfChange(W)