diff --git a/src/scripts/layout.lua b/src/scripts/layout.lua
index 6c5a7acd3..2f2a48220 100644
--- a/src/scripts/layout.lua
+++ b/src/scripts/layout.lua
@@ -2200,9 +2200,6 @@ function Layout_scenic_vistas()
       Cave_build_a_scenic_vista(A)
     end
   end
-
-  -- MSSP-TODO
-  -- Layout_sync_scenic_vista_heights()
 end
 
 
@@ -2556,4 +2553,3 @@ function Layout_outdoor_shadows()
   end
   end
 end
-
diff --git a/src/scripts/level.lua b/src/scripts/level.lua
index d018b07a6..044901a17 100644
--- a/src/scripts/level.lua
+++ b/src/scripts/level.lua
@@ -249,11 +249,11 @@ function Episode_pick_names()
   -- i.e. TITLE, SUB_TITLE, EPISODE, TECH, URBAN, GOTHIC
   -- and so on...
 
-  --[[
+  --
   local i = 1
   gui.printf("\nGenerator Test:\n")
   while i <= 128 do
-    episode_test_name = Naming_grab_one("EPISODE")
+    episode_test_name = Naming_grab_one("URBAN")
     gui.printf(episode_test_name .. " | ")
     if i%4 == 0 then
       gui.printf("\n")
@@ -261,7 +261,7 @@ function Episode_pick_names()
     i = i + 1
   end
   gui.printf("\n")
-  ]]
+
 
   -- game name (for title screen)
   if not GAME.title then
diff --git a/src/scripts/naming.lua b/src/scripts/naming.lua
index 2157f7efb..16c4af621 100644
--- a/src/scripts/naming.lua
+++ b/src/scripts/naming.lua
@@ -4710,7 +4710,6 @@ namelib.SYLLABLES =
 
 
 
--- MSSP-TODO
 -- noun generator, creates nouns from syllables
 -- currently two modes:
 -- "Exotic" - syllables come from country names
diff --git a/src/scripts/render.lua b/src/scripts/render.lua
index 538ba8cd9..e1bfc0e21 100644
--- a/src/scripts/render.lua
+++ b/src/scripts/render.lua
@@ -2691,7 +2691,7 @@ end
 
 function Render_find_street_markings()
 
-  -- Render street markings -- MSSP-TODO
+  -- Render street markings
   --
   -- This street marking algorithm attempts to scan
   -- seeds that are inside a street area.
@@ -3753,4 +3753,3 @@ function Render_cells(area)
 
   render_all_cells(2)
 end
-