diff --git a/src/main/java/fr/xephi/authme/command/CommandHandlerService.java b/src/main/java/fr/xephi/authme/command/CommandHandlerService.java
deleted file mode 100644
index f3fc2de59..000000000
--- a/src/main/java/fr/xephi/authme/command/CommandHandlerService.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package fr.xephi.authme.command;
-
-import com.timvisee.dungeonmaze.service.Service;
-
-public class CommandHandlerService extends Service {
-
-    /** Service name. */
-    private static final String SERVICE_NAME = "Command Handler";
-
-    /** Command handler instance. */
-    private CommandHandler commandHandler;
-
-    /**
-     * Initialize the service.
-     *
-     * @return True on success, false on failure. True will also be returned if the service was initialized already.
-     */
-    @Override
-    public boolean init() {
-        // Initialize the command handler
-        this.commandHandler = new CommandHandler(false);
-
-        // Initialize the command handler, return the result
-        return this.commandHandler.init();
-    }
-
-    /**
-     * Check whether the service is initialized.
-     *
-     * @return True if the service is initialized, false otherwise.
-     */
-    @Override
-    public boolean isInit() {
-        // Make sure the command handler is set
-        if(this.commandHandler == null)
-            return false;
-
-        // Check whether the command handler is initialized
-        return this.commandHandler.isInit();
-    }
-
-    /**
-     * Destroy the service. The destruction won't be forced.
-     *
-     * @param force True to force the destruction. This wil re-destroy the service even if it isn't initialized.
-     *              This will also force the initialization state to be set to false even if an error occurred while
-     *              destroying.
-     *
-     * @return True on success, false on failure. True will also be returned if the service wasn't initialized. False
-     * might be returned if force is set to true, even though the initialization state is set to false.
-     */
-    @Override
-    public boolean destroy(boolean force) {
-        // Make sure the command handler is initialized
-        if(!this.isInit() && !force)
-            return true;
-
-        // Destroy the command handler
-        if(this.commandHandler != null) {
-            if(!this.commandHandler.destroy()) {
-                if(force)
-                    this.commandHandler = null;
-                return false;
-            }
-        }
-
-        // Return the result
-        this.commandHandler = null;
-        return true;
-    }
-
-    /**
-     * Get the name of the service.
-     *
-     * @return Service name.
-     */
-    @Override
-    public String getName() {
-        return SERVICE_NAME;
-    }
-
-    /**
-     * Get the command handler.
-     *
-     * @return Command handler instance.
-     */
-    public CommandHandler getCommandHandler() {
-        return this.commandHandler;
-    }
-}