diff --git a/sources/Commands/Commands_Feature.uc b/sources/Commands/Commands_Feature.uc
index 7f7c2b8..a064b5c 100644
--- a/sources/Commands/Commands_Feature.uc
+++ b/sources/Commands/Commands_Feature.uc
@@ -20,8 +20,7 @@
  * You should have received a copy of the GNU General Public License
  * along with Acedia.  If not, see <https://www.gnu.org/licenses/>.
  */
-class Commands_Feature extends Feature
-    config(AcediaSystem);
+class Commands_Feature extends Feature;
 
 //  Delimiters that always separate command name from it's parameters
 var private array<Text>         commandDelimiters;
@@ -38,6 +37,7 @@ var LoggerAPI.Definition errCommandDuplicate;
 protected function OnEnabled()
 {
     registeredCommands = _.collections.EmptyAssociativeArray();
+    RegisterCommand(class'ACommandHelp');
     _.unreal.broadcasts.OnHandleText(self).connect = HandleText;
     //  Macro selector
     commandDelimiters[0] = P("@");
diff --git a/sources/Manifest.uc b/sources/Manifest.uc
index 19d8a41..6e80d83 100644
--- a/sources/Manifest.uc
+++ b/sources/Manifest.uc
@@ -24,10 +24,6 @@ defaultproperties
 {
     features(0)     = class'Commands_Feature'
     features(1)     = class'Avarice_Feature'
-    commands(0)     = class'ACommandHelp'
-    commands(1)     = class'ACommandDosh'
-    commands(2)     = class'ACommandNick'
-    commands(3)     = class'ACommandTrader'
     services(0)     = class'ConnectionService'
     services(1)     = class'PlayerService'
     aliasSources(0) = class'AliasSource'
diff --git a/sources/_manifest.uc b/sources/_manifest.uc
index ece3acc..e6b389d 100644
--- a/sources/_manifest.uc
+++ b/sources/_manifest.uc
@@ -27,9 +27,6 @@ var public const array< class<AliasSource> >    aliasSources;
 //  List of features in this manifest's package.
 var public const array< class<Feature> >        features;
 
-//  List of commands in this manifest's package.
-var public const array< class<Command> >        commands;
-
 //  List of test cases in this manifest's package.
 var public const array< class<TestCase> >       testCases;