diff --git a/Scripts/Python/Cleft.py b/Scripts/Python/Cleft.py
index f99fe67918..97d1020dc3 100644
--- a/Scripts/Python/Cleft.py
+++ b/Scripts/Python/Cleft.py
@@ -108,12 +108,12 @@ def __init__(self):
         else:
             pages += ["Desert","Cleft","FemaleCleftDropIn","MaleCleftDropIn","clftJCsDesert","clftJCsChasm"]
         if loadZandi:
-            pages += ["clftZandiVis","ZandiCrossLegs","ZandiDirections","ZandiDirections01","ZandiDirections02","ZandiDirections03"]
+            pages += ["clftZandiVis","ZandiCrossLegs","ZandiDirections"]
             pages += ["ZandiIdle","ZandiRubNose","ZandiScratchHead","ZandiTurnPage","ZandiAllFace","ZandiOpen01Face"]
             pages += ["ZandiOpen02Face","ZandiRand01Face","ZandiRand02Face","ZandiRand03Face","ZandiRand04Face","ZandiRand05Face"]
             pages += ["ZandiRes01aFace","ZandiRes01bFace","ZandiRes02aFace","ZandiRes02bFace","ZandiRes03aFace","ZandiRes03bFace"]
             pages += ["ZandiJC01aFace","ZandiJC01bFace","ZandiJC02aFace","ZandiJC02bFace","ZandiJC03aFace","ZandiJC03bFace"]
-            pages += ["ZandiJC04aFace","ZandiJC04bFace","ZandiJC05aFace","ZandiJC05bFace","ZandiJC06aFace","ZandiJC06bFace"]
+            pages += ["ZandiJC04aFace","ZandiJC05aFace","ZandiJC05bFace","ZandiJC06aFace","ZandiJC06bFace"]
             pages += ["ZandiJC07aFace","ZandiJC07bFace"]
         else:
             PtDebugPrint("Zandi seems to have stepped away from the Airstream. Hmmm...")
@@ -191,8 +191,6 @@ def OnServerInitComplete(self):
             SDLVarSceneYeesha = "clftSceneYeeshaUnseen"
             boolSceneYeesha = ageSDL[SDLVarSceneYeesha][0]
             if boolSceneYeesha:
-                #PtDebugPrint("Cleft.OnServerInitComplete: SDL says Yeesha hasn't played yet, paging in SceneYeesha stuff...")
-                #PtPageInNode("clftSceneYeesha")
                 SDLVarOfficeDoor = "clftOfficeDoorClosed"
                 boolOfficeDoor = ageSDL[SDLVarOfficeDoor][0]
                 if boolOfficeDoor:
diff --git a/Scripts/Python/city.py b/Scripts/Python/city.py
index 5480c865a6..adb99811d2 100644
--- a/Scripts/Python/city.py
+++ b/Scripts/Python/city.py
@@ -122,7 +122,7 @@ def __init__(self):
         # For the non-public age, add all the remaining pages
         if not IsKadishGallery:
             pages += ["canyon","cavetjunction","courtyard","ferry","greatstair","guildhall","harbor","HarborReflect"]
-            pages += ["islmGreatZeroState","islmJCNote","islmNegilahnCreatureChartGUI","islmNickNote","islmPodMapGUI"]
+            pages += ["islmJCNote","islmNegilahnCreatureChartGUI","islmNickNote","islmPodMapGUI"]
             pages += ["islmWatsonLetterGUI","KahloPub","kahlopubtunnel","library","LibraryInterior"]
             pages += ["MuseumInteriorPage","palace"]
             pages += ["islmBahroShoutFerry","islmBahroShoutLibrary","islmBahroShoutPalace"]
diff --git a/Scripts/Python/clftNpcZandi.py b/Scripts/Python/clftNpcZandi.py
index fbdaed1b48..e2e639b069 100644
--- a/Scripts/Python/clftNpcZandi.py
+++ b/Scripts/Python/clftNpcZandi.py
@@ -479,7 +479,7 @@ def ZandiSpeaks(self, clicked = 0):
                 if useSpeech == "1":
                     self.ZandiFace = "ZandiJC04aFace"
                 else:
-                    self.ZandiFace = "ZandiJC04bFace"
+                    self.ZandiFace = "ZandiJC04aFace" # Because ZandiJC04bFace is missing...
                 
             elif not self.CheckForJC(jcProgress, JC.Sign) and not PtIsDemoMode():
                 if self.LastSpeech != 7:
diff --git a/Scripts/Python/kemoEmgrPhase0.py b/Scripts/Python/kemoEmgrPhase0.py
index 4a89d75ac1..3ee95dc7ba 100644
--- a/Scripts/Python/kemoEmgrPhase0.py
+++ b/Scripts/Python/kemoEmgrPhase0.py
@@ -53,9 +53,7 @@
 #globals
 variable = None
 
-BooleanVARs = [
-    "kemoJourneySymbolVis",
-]
+BooleanVARs = []
 
 
 AgeStartedIn = None
diff --git a/Scripts/Python/ki/__init__.py b/Scripts/Python/ki/__init__.py
index baba22be1f..1e4f969f4d 100644
--- a/Scripts/Python/ki/__init__.py
+++ b/Scripts/Python/ki/__init__.py
@@ -297,12 +297,9 @@ def __del__(self):
         PtUnloadDialog("KIHelp")
         PtUnloadDialog("KIHelpMenu")
         PtUnloadDialog("KeyMapDialog")
-        PtUnloadDialog("GameSettingsDialog")
         PtUnloadDialog("CalibrationGUI")
         PtUnloadDialog("TrailerPreviewGUI")
-        PtUnloadDialog("KeyMap2Dialog")
         PtUnloadDialog("AdvancedGameSettingsDialog")
-        PtUnloadDialog("OptionsHelpGUI")
         PtUnloadDialog("bkNotebook")
         PtUnloadDialog("bkBahroRockBook")
         PtUnloadDialog("YeeshaPageGUI")
@@ -344,12 +341,9 @@ def OnInit(self):
         PtLoadDialog("KIHelp")
         PtLoadDialog("KIHelpMenu")
         PtLoadDialog("KeyMapDialog")
-        PtLoadDialog("GameSettingsDialog")
         PtLoadDialog("CalibrationGUI")
         PtLoadDialog("TrailerPreviewGUI")
-        PtLoadDialog("KeyMap2Dialog")
         PtLoadDialog("AdvancedGameSettingsDialog")
-        PtLoadDialog("OptionsHelpGUI")
         PtLoadDialog("bkNotebook")
         PtLoadDialog("bkBahroRockBook")
         PtLoadDialog("YeeshaPageGUI")
diff --git a/Scripts/Python/tldnEmgrPhase0.py b/Scripts/Python/tldnEmgrPhase0.py
index 386a6c96fc..9d9bb5699c 100644
--- a/Scripts/Python/tldnEmgrPhase0.py
+++ b/Scripts/Python/tldnEmgrPhase0.py
@@ -53,9 +53,7 @@
 #globals
 variable = None
 
-BooleanVARs = [
-    "tldnPumpSwitchFunc"
-    ]
+BooleanVARs = []
 
 AgeStartedIn = None
 
diff --git a/Scripts/Python/xOptionsMenu.py b/Scripts/Python/xOptionsMenu.py
index c0fbe45559..1bed390520 100644
--- a/Scripts/Python/xOptionsMenu.py
+++ b/Scripts/Python/xOptionsMenu.py
@@ -466,7 +466,6 @@ def OnFirstUpdate(self):
         "First update, load our dialogs"
         PtLoadDialog("OptionsMenuGUI",self.key)
         PtLoadDialog("KeyMapDialog",self.key)
-        PtLoadDialog("GameSettingsDialog",self.key)
         PtLoadDialog("CalibrationGUI",self.key)
         PtLoadDialog("TrailerPreviewGUI",self.key)
         PtLoadDialog("AdvancedGameSettingsDialog",self.key)
@@ -479,7 +478,6 @@ def OnFirstUpdate(self):
     def __del__(self):
         "the destructor - unload any dialogs we loaded"
         PtUnloadDialog("KeyMapDialog")
-        PtUnloadDialog("GameSettingsDialog")
         PtUnloadDialog("CalibrationGUI")
         PtUnloadDialog("TrailerPreviewGUI")
         PtUnloadDialog("AdvancedGameSettingsDialog")
diff --git a/Sources/Plasma/NucleusLib/pnMessage/plClientMsg.cpp b/Sources/Plasma/NucleusLib/pnMessage/plClientMsg.cpp
index 6027608e9b..7e1e36d1c6 100644
--- a/Sources/Plasma/NucleusLib/pnMessage/plClientMsg.cpp
+++ b/Sources/Plasma/NucleusLib/pnMessage/plClientMsg.cpp
@@ -55,7 +55,7 @@ void plClientMsg::AddRoomLoc(const plLocation& loc)
     if (loc.IsValid())
         fRoomLocs.emplace_back(loc);
     else
-        hsStatusMessage("Trying to load an invalid room, ignoring");
+        hsAssert(false, "Trying to load an invalid room");
 }
 
 void plClientMsg::Read(hsStream* stream, hsResMgr* mgr)