diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index 7753e8cd3a6..5a7fd8a98a0 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -16,27 +16,29 @@
 	var/list/blood_DNA
 	var/blood_color
 	var/pass_flags = 0
-	var/germ_level = GERM_LEVEL_AMBIENT // The higher the germ level, the more germ on the atom.
-	var/simulated = TRUE //filter for actions - used by lighting overlays
+	/// The higher the germ level, the more germ on the atom.
+	var/germ_level = GERM_LEVEL_AMBIENT
+	/// Filter for actions - used by lighting overlays
+	var/simulated = TRUE
 	var/atom_say_verb = "says"
-	var/bubble_icon = "default" ///what icon the mob uses for speechbubbles
-	var/dont_save = FALSE // For atoms that are temporary by necessity - like lighting overlays
+	/// What icon the mob uses for speechbubbles
+	var/bubble_icon = "default"
 
-	///Chemistry.
+	// Chemistry.
 	var/container_type = NONE
 	var/datum/reagents/reagents = null
 
-	//This atom's HUD (med/sec, etc) images. Associative list.
+	/// This atom's HUD (med/sec, etc) images. Associative list.
 	var/list/image/hud_list
-	//HUD images that this atom can provide.
+	/// HUD images that this atom can provide.
 	var/list/hud_possible
 
-	//Value used to increment ex_act() if reactionary_explosions is on
+	/// Value used to increment ex_act() if reactionary_explosions is on
 	var/explosion_block = 0
 
-	//Detective Work, used for the duplicate data points kept in the scanners
+	// Detective Work, used for the duplicate data points kept in the scanners
 	var/list/original_atom
-	/// Materials scannable by detective
+	/// List of fibers that this atom has
 	var/list/suit_fibers
 
 	var/admin_spawned = FALSE	//was this spawned by an admin? used for stat tracking stuff.
diff --git a/code/modules/awaymissions/maploader/writer.dm b/code/modules/awaymissions/maploader/writer.dm
index 54c5ef60382..bac5af74080 100644
--- a/code/modules/awaymissions/maploader/writer.dm
+++ b/code/modules/awaymissions/maploader/writer.dm
@@ -139,23 +139,11 @@
 	// Objects loop
 	if(!(flags & DMM_IGNORE_OBJS))
 		for(var/obj/O in model.contents)
-			if(O.dont_save || QDELETED(O))
+			if(QDELETED(O))
 				continue
 
 			obj_template += "[O.type][check_attributes(O,use_json=use_json)],"
 
-	// Mobs Loop
-	for(var/mob/M in model.contents)
-		if(M.dont_save || QDELETED(M))
-			continue
-
-		if(M.client)
-			if(!(flags & DMM_IGNORE_PLAYERS))
-				mob_template += "[M.type][check_attributes(M,use_json=use_json)],"
-		else
-			if(!(flags & DMM_IGNORE_NPCS))
-				mob_template += "[M.type][check_attributes(M,use_json=use_json)],"
-
 	// Area
 	if(!(flags & DMM_IGNORE_AREAS))
 		var/area/m_area = model.loc
diff --git a/code/modules/mob/mob_vars.dm b/code/modules/mob/mob_vars.dm
index 0a236789e63..bf265fd7330 100644
--- a/code/modules/mob/mob_vars.dm
+++ b/code/modules/mob/mob_vars.dm
@@ -4,7 +4,6 @@
 	animate_movement = 2
 	pressure_resistance = 8
 	throwforce = 10
-	dont_save = TRUE //to avoid it messing up in buildmode saving
 	var/datum/mind/mind
 	blocks_emissive = EMISSIVE_BLOCK_GENERIC