diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java
index d8d80afc..f6804bf1 100644
--- a/src/main/java/fr/xephi/authme/AuthMe.java
+++ b/src/main/java/fr/xephi/authme/AuthMe.java
@@ -339,20 +339,6 @@ public class AuthMe extends JavaPlugin {
         pm.registerEvents(new AuthMeEntityListener(this), this);
         pm.registerEvents(new AuthMeServerListener(this), this);
 
-        // TODO: This is moved to CommandManager.registerCommands() handled by
-        // AuthMe.onCommand() -- timvisee
-        // Register commands
-        // getCommand("authme").setExecutor(new AdminCommand(this));
-        // getCommand("register").setExecutor(new RegisterCommand(this));
-        // getCommand("login").setExecutor(new LoginCommand(this));
-        // getCommand("changepassword").setExecutor(new
-        // ChangePasswordCommand(this));
-        // getCommand("logout").setExecutor(new LogoutCommand(this));
-        // getCommand("unregister").setExecutor(new UnregisterCommand(this));
-        // getCommand("email").setExecutor(new EmailCommand(this));
-        // getCommand("captcha").setExecutor(new CaptchaCommand(this));
-        // getCommand("converter").setExecutor(new ConverterCommand(this));
-
         // Purge on start if enabled
         autoPurge();