diff --git a/changelog.txt b/changelog.txt
index 61a4c09f..ff289bc4 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -179,7 +179,6 @@ CubeScript
 [*] Substr crash bug is fixed. Also the command can now use a negative position value.
 [*] New stat in (pstat_score) for teamkills. New list is: FLAGS FRAGS DEATHS POINTS TEAM TEAMKILLS NAME // TODO move to compatibility.cfg
 [*] on_quit.cfg for deleting aliases from saved.cfg upon quit.
-[*] Many aliases that were stored in saved.cfg are now being stored as a single alias (list) "tmpClientData" and being restored on start. (see on_quit.cfg) // Should be working now, please report any problems like unknown alias lookup errors though!
 [*] Missing bracket ([], (), etc.) errors now also notify the client of what file the error resides in.
 [*] New automatically executed scripts folder in the root install directory of AC.
 [*] New delta_edit/game_# aliases for easily tweaking gamma/fov/flyspeed on-the-fly. (e.g. Hold F5 and scroll for gamma, F6 for fov, bind "domodifier 10" to a key for flyspeed)
diff --git a/config/defaults.cfg b/config/defaults.cfg
index a56c7804..900e80c8 100644
--- a/config/defaults.cfg
+++ b/config/defaults.cfg
@@ -35,6 +35,4 @@ timeBetChkPts = 60000
 timeUntilTele = 120000
 survMaxBots = 32
 spamSurvMsgs = 0
-nonSurvDefaults = 0
-tmpClientData = ""
-tmpSurvData = ""
\ No newline at end of file
+nonSurvDefaults = 0
\ No newline at end of file
diff --git a/config/on_quit.cfg b/config/on_quit.cfg
index a309e6c0..9123c235 100644
--- a/config/on_quit.cfg
+++ b/config/on_quit.cfg
@@ -1,27 +1,6 @@
 // Adds a list of aliases to be deleted (cleared from saved.cfg) on every quit.
 // Do not modify. (unless you really know what you're doing)
 
-tmpClientList = "curname LANG nickhighlight soundqualityalias dyngamma __gibsgore gfxqualityalias poniesmodeon old_editbinds"
-tmpSurvList   = "survMaxBots survDifficulty timeBetChkPts survNumBots nonSurvDefaults survBotsToAdd timeUntilTele survMap spamSurvMsgs"
-
-addOnQuit [
-  persistidents 1
-  tmpClientData = ""; tmpSurvData = ""
-  loop cql (listlen $tmpClientList) [ add2list tmpClientData (getalias (at $tmpClientList $cql))) ]
-  loop oql (listlen $tmpSurvList) [ add2list tmpSurvData (getalias (at $tmpSurvList $oql)) ]
-]
-
-add2alias afterinit [
-  sleep 10 [
-    if (&& (checkalias tmpClientData) (= (listlen $tmpClientData) (listlen $tmpClientList))) [
-      loop cil (listlen $tmpClientData) [ (at $tmpClientList $cil) = (at $tmpClientData $cil) ]
-    ]
-    if (&& (checkalias tmpSurvData) (= (listlen $tmpSurvData) (listlen $tmpSurvList))) [
-      loop ail (listlen $tmpSurvData) [ (at $tmpSurvList $ail) = (at $tmpSurvData $ail) ]
-    ]
-  ] 1
-]
-
 addListOnQuit = [ alias_list = $arg1; loop al (listlen $alias_list) [ addOnQuit (concat "delalias" (at $alias_list $al)) ] ]
 
 on_quit_aliases = [
@@ -64,5 +43,4 @@ on_quit_aliases = [
 ]
 
 addListOnQuit $on_quit_aliases
-addListOnQuit (concat $tmpClientList $tmpSurvList)
 addOnQuit [ delalias alias_list ]
\ No newline at end of file
diff --git a/config/survival.cfg b/config/survival.cfg
index 62ea0e9c..b4664bcf 100644
--- a/config/survival.cfg
+++ b/config/survival.cfg
@@ -18,7 +18,8 @@ resetSurvAliases = [
 
 if (! (checkalias afterinit)) [ afterinit = "" ]
 if (! (strstr $afterinit resetSurvAliases)) [
-  add2alias afterinit [ sleep 20 [ resetSurvAliases ] 1 ]
+  add2alias afterinit resetSurvAliases
+  if (! (checkalias survMap)) [ survMap = (rnd (listlen $defaultmaps)) ]
 ]
 
 genSurvDifStr = [