diff --git a/common/content/options.js b/common/content/options.js
index 2dc418b0..92feba0e 100644
--- a/common/content/options.js
+++ b/common/content/options.js
@@ -582,7 +582,6 @@ const Option = Class("Option", {
         throw ValueError(error);
     },
 
-    // TODO: Run this by default?
     /**
      * Validates the specified <b>values</b> against values generated by the
      * option's completer function.
diff --git a/melodactyl/content/player.js b/melodactyl/content/player.js
index 1d04f904..9e8fd169 100644
--- a/melodactyl/content/player.js
+++ b/melodactyl/content/player.js
@@ -782,8 +782,7 @@ const Player = Module("player", {
                     ["0", "Repeat none"],
                     ["1", "Repeat one"],
                     ["2", "Repeat all"]
-                ],
-                validator: Option.validateCompleter
+                ]
             });
 
         options.add(["shuffle"],
diff --git a/teledactyl/content/mail.js b/teledactyl/content/mail.js
index 518c9bd6..f450b2fc 100644
--- a/teledactyl/content/mail.js
+++ b/teledactyl/content/mail.js
@@ -883,8 +883,7 @@ const Mail = Module("mail", {
             "Set the archive folder",
             "string", "Archive",
             {
-                completer: function (context) completion.mailFolder(context),
-                validator: Option.validateCompleter
+                completer: function (context) completion.mailFolder(context)
             });
 
         // TODO: generate the possible values dynamically from the menu
@@ -907,8 +906,7 @@ const Mail = Module("mail", {
                     ["classic",  "Classic View"],
                     ["wide",     "Wide View"],
                     ["vertical", "Vertical View"]
-                ],
-                validator: Option.validateCompleter
+                ]
             });
 
         options.add(["smtpserver", "smtp"],
@@ -921,8 +919,7 @@ const Mail = Module("mail", {
                     services.get("smtpService").defaultServer = server;
                     return value;
                 },
-                completer: function (context) [[s.key, s.serverURI] for ([, s] in Iterator(mail.smtpServers))],
-                validator: Option.validateCompleter
+                completer: function (context) [[s.key, s.serverURI] for ([, s] in Iterator(mail.smtpServers))]
             });
 
         /*options.add(["threads"],