diff --git a/sources/MapList/MapList.uc b/sources/MapList/MapList.uc
index d5891ce..c9f0e7a 100644
--- a/sources/MapList/MapList.uc
+++ b/sources/MapList/MapList.uc
@@ -1,5 +1,5 @@
 /**
- *  Config for `MapList_Feature`.
+ *  Config class for storing map lists.
  *      Copyright   2023 Anton Tarasenko
  *                  2023 Shtoyan
  *------------------------------------------------------------------------------
diff --git a/sources/StartUp.uc b/sources/StartUp.uc
index b9c698d..184603c 100644
--- a/sources/StartUp.uc
+++ b/sources/StartUp.uc
@@ -126,9 +126,6 @@ public function array<Packages.FeatureConfigPair> GetAutoConfigurationInfo()
     local array<Packages.FeatureConfigPair> result;
 
     availableFeatures = _.environment.GetAvailableFeatures();
-    // We only have a single feature, so instead of adding our own manifest, simply add it here
-    class'MapList_Feature'.static.LoadConfigs();
-    availableFeatures[availableFeatures.length] = class'MapList_Feature';
     for (i = 0; i < availableFeatures.length; i += 1)
     {
         autoConfig = availableFeatures[i].static.GetAutoEnabledConfig();
diff --git a/sources/VotingHandlerAdapter.uc b/sources/VotingHandlerAdapter.uc
index 1589d98..b892455 100644
--- a/sources/VotingHandlerAdapter.uc
+++ b/sources/VotingHandlerAdapter.uc
@@ -141,15 +141,9 @@ public final function InjectIntoVotingHandler()
 }
 
 public function TrySetupMapList() {
-    local MapList_Feature mapListFeature;
     local Text currentConfigName;
     local MapList currentConfig;
 
-    mapListFeature = MapList_Feature(class'MapList_Feature'.static.GetEnabledInstance());
-    if (mapListFeature == none) {
-        return;
-    }
-    currentConfigName = mapListFeature.GetCurrentConfig();
     if (currentConfigName != none) {
         currentConfig = MapList(class'MapList'.static.GetConfigInstance(currentConfigName));
     }