diff --git a/src/Artemis.Core/Artemis.Core.csproj b/src/Artemis.Core/Artemis.Core.csproj
index 0d71cb1fa..e48a7c924 100644
--- a/src/Artemis.Core/Artemis.Core.csproj
+++ b/src/Artemis.Core/Artemis.Core.csproj
@@ -116,7 +116,8 @@
     <Compile Include="Plugins\Abstract\Module.cs" />
     <Compile Include="Plugins\Abstract\Plugin.cs" />
     <Compile Include="Plugins\Models\PluginInfo.cs" />
-    <Compile Include="Plugins\Models\PluginSettings.cs" />
+    <Compile Include="Plugins\Models\PluginSetting.cs" />
+    <Compile Include="Plugins\Models\PluginSettingsContainer.cs" />
     <Compile Include="ProfileElements\Folder.cs" />
     <Compile Include="ProfileElements\Interfaces\IProfileElement.cs" />
     <Compile Include="ProfileElements\Layer.cs" />
diff --git a/src/Artemis.Core/Plugins/Models/PluginSettingsContainer.cs b/src/Artemis.Core/Plugins/Models/PluginSettingsContainer.cs
index bc458650c..4f608276f 100644
--- a/src/Artemis.Core/Plugins/Models/PluginSettingsContainer.cs
+++ b/src/Artemis.Core/Plugins/Models/PluginSettingsContainer.cs
@@ -2,7 +2,6 @@
 using System.Threading.Tasks;
 using Artemis.Storage.Entities;
 using Artemis.Storage.Repositories;
-using Newtonsoft.Json;
 
 namespace Artemis.Core.Plugins.Models
 {
@@ -28,63 +27,4 @@ namespace Artemis.Core.Plugins.Models
             return false;
         }
     }
-
-    public class PluginSetting<T>
-    {
-        private readonly PluginInfo _pluginInfo;
-        private readonly SettingEntity _settingEntity;
-        private readonly SettingRepository _settingRepository;
-
-        internal PluginSetting(PluginInfo pluginInfo, SettingRepository settingRepository, SettingEntity settingEntity)
-        {
-            _pluginInfo = pluginInfo;
-            _settingRepository = settingRepository;
-            _settingEntity = settingEntity;
-
-            Name = settingEntity.Name;
-            Value = JsonConvert.DeserializeObject<T>(settingEntity.Value);
-        }
-
-        /// <summary>
-        ///     The name of the setting, unique to this plugin
-        /// </summary>
-        public string Name { get; }
-
-        /// <summary>
-        ///     The value of the setting
-        /// </summary>
-        public T Value { get; set; }
-
-        /// <summary>
-        ///     Determines whether the setting has been changed
-        /// </summary>
-        public bool HasChanged => JsonConvert.SerializeObject(Value) != _settingEntity.Value;
-
-        /// <summary>
-        ///     Resets the setting to the last saved value
-        /// </summary>
-        public void RejectChanges()
-        {
-            Value = JsonConvert.DeserializeObject<T>(_settingEntity.Value);
-        }
-
-        /// <summary>
-        ///     Saves the setting
-        /// </summary>
-        public void Save()
-        {
-            _settingEntity.Value = JsonConvert.SerializeObject(Value);
-            _settingRepository.Save();
-        }
-
-        /// <summary>
-        ///     Saves the setting asynchronously
-        /// </summary>
-        /// <returns></returns>
-        public async Task SaveAsync()
-        {
-            _settingEntity.Value = JsonConvert.SerializeObject(Value);
-            await _settingRepository.SaveAsync();
-        }
-    }
 }
\ No newline at end of file