diff --git a/Patchwork/src/main/java/me/totalfreedom/base/Registration.java b/Patchwork/src/main/java/me/totalfreedom/base/Registration.java
index 90e0b93..64159c7 100644
--- a/Patchwork/src/main/java/me/totalfreedom/base/Registration.java
+++ b/Patchwork/src/main/java/me/totalfreedom/base/Registration.java
@@ -4,7 +4,6 @@ import me.totalfreedom.data.*;
 
 public class Registration
 {
-    private final CommandRegistry commandRegistry;
     private final EventRegistry eventRegistry;
     private final UserRegistry userRegistry;
     private final ServiceRegistry serviceRegistry;
@@ -13,7 +12,6 @@ public class Registration
 
     public Registration()
     {
-        this.commandRegistry = new CommandRegistry();
         this.eventRegistry = new EventRegistry();
         this.userRegistry = new UserRegistry();
         this.serviceRegistry = new ServiceRegistry();
@@ -26,11 +24,6 @@ public class Registration
         return moduleRegistry;
     }
 
-    public CommandRegistry getCommandRegistry()
-    {
-        return commandRegistry;
-    }
-
     public EventRegistry getEventRegistry()
     {
         return eventRegistry;
diff --git a/Patchwork/src/main/java/me/totalfreedom/data/CommandRegistry.java b/Patchwork/src/main/java/me/totalfreedom/data/CommandRegistry.java
deleted file mode 100644
index a766969..0000000
--- a/Patchwork/src/main/java/me/totalfreedom/data/CommandRegistry.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package me.totalfreedom.data;
-
-import co.aikar.commands.*;
-import me.totalfreedom.base.CommonsBase;
-
-public class CommandRegistry
-{
-    private final PaperCommandManager manager;
-    private final PaperCommandContexts contexts;
-    private final PaperCommandCompletions completions;
-    private final CommandReplacements replacements;
-    private final CommandConditions<BukkitCommandIssuer,
-            BukkitCommandExecutionContext,
-            BukkitConditionContext> conditions;
-
-    public CommandRegistry()
-    {
-        this.manager = new PaperCommandManager(CommonsBase.getInstance());
-        this.contexts = new PaperCommandContexts(manager);
-        this.completions = new PaperCommandCompletions(manager);
-        this.replacements = manager.getCommandReplacements();
-        this.conditions = manager.getCommandConditions();
-    }
-
-    public PaperCommandManager getManager()
-    {
-        return manager;
-    }
-
-    public PaperCommandContexts getContexts()
-    {
-        return contexts;
-    }
-
-    public PaperCommandCompletions getCompletions()
-    {
-        return completions;
-    }
-
-    public CommandReplacements getReplacements()
-    {
-        return replacements;
-    }
-
-    public CommandConditions<BukkitCommandIssuer,
-            BukkitCommandExecutionContext,
-            BukkitConditionContext> getConditions()
-    {
-        return conditions;
-    }
-
-    public void register(BaseCommand cmd)
-    {
-        manager.registerCommand(cmd);
-    }
-
-    public void unregister(BaseCommand cmd)
-    {
-        manager.unregisterCommand(cmd);
-    }
-}