diff --git a/RetroKS/Console/ColorSet.vb b/RetroKS/Console/ColorSet.vb
index 68d2489..482c4f0 100644
--- a/RetroKS/Console/ColorSet.vb
+++ b/RetroKS/Console/ColorSet.vb
@@ -77,8 +77,7 @@ Module ColorSet
             W(currentStepMessage, "input")
             answerColor = Console.ReadLine()
 
-            'Checks the user input if colors exist, and then try to put it into a temporary array. 
-            'TODO: "Live Mode" will come in the future.
+            'Checks the user input if colors exist, and then try to put it into a temporary array.
             If i <> 8 Then
                 If answerColor = "RESET" Then
                     'Give a signal to the command that the colors are resetting. 
diff --git a/RetroKS/Login/UserManagement.vb b/RetroKS/Login/UserManagement.vb
index 722546c..2c86d80 100644
--- a/RetroKS/Login/UserManagement.vb
+++ b/RetroKS/Login/UserManagement.vb
@@ -20,7 +20,6 @@
 
 Module UserManagement
 
-    'TODO: Merge initializeMainUsers to adduser
     Sub initializeMainUsers()
 
         'Check if the process is done, then do nothing if it is done.
@@ -57,7 +56,7 @@ Module UserManagement
             disabledList.Add(uninitUser, False)
         Catch ex As Exception
             If DebugMode = True Then
-                Wln("Error trying to add username." + vbNewLine + "Error {0}: {1}" + vbNewLine + "{2}", "neutralText", _
+                Wln("Error trying to add username." + vbNewLine + "Error {0}: {1}" + vbNewLine + "{2}", "neutralText",
                     Err.Number, Err.Description, ex.StackTrace)
                 Wdbg(ex.StackTrace, True)
             Else
@@ -302,7 +301,7 @@ Module UserManagement
             End If
         Catch ex As Exception
             If DebugMode = True Then
-                Wln("Error trying to add username." + vbNewLine + "Error {0}: {1}" + vbNewLine + "{2}", "neutralText", _
+                Wln("Error trying to add username." + vbNewLine + "Error {0}: {1}" + vbNewLine + "{2}", "neutralText",
                     Err.Number, Err.Description, ex.StackTrace)
                 Wdbg(ex.StackTrace, True)
             Else
diff --git a/RetroKS/Shell/HelpSystem.vb b/RetroKS/Shell/HelpSystem.vb
index e42048d..05f3b76 100644
--- a/RetroKS/Shell/HelpSystem.vb
+++ b/RetroKS/Shell/HelpSystem.vb
@@ -22,7 +22,6 @@ Module HelpSystem
 
         If command = "" Then
 
-            'TODO: Convert (All Commands) help system from plain text to dictionaries
             If simHelp = False Then
                 Wln("Help commands:" + vbNewLine + vbNewLine +
                     "adduser: Adds users (Only admins can access this command)" + vbNewLine +