Merge branch 'development'

src/Artemis.Core/Plugins/PluginFeature.cs

@@ -75,7 +75,8 @@ namespace Artemis.Core
         /// </param>
         protected virtual void Dispose(bool disposing)
         {
-            if (disposing) InternalDisable();
+            if (disposing)
+                SetEnabled(false);
         }
 
         /// <summary>
@@ -104,16 +105,6 @@ namespace Artemis.Core
             Profiler.StopMeasurement("Update");
         }
 
-        internal void StartRenderMeasure()
-        {
-            Profiler.StartMeasurement("Render");
-        }
-
-        internal void StopRenderMeasure()
-        {
-            Profiler.StopMeasurement("Render");
-        }
-
         internal void SetEnabled(bool enable, bool isAutoEnable = false)
         {
             if (enable == IsEnabled)

src/Artemis.Core/Plugins/ScriptingProviders/Scripts/ProfileScript.cs

@@ -11,10 +11,6 @@ namespace Artemis.Core.ScriptingProviders
         protected ProfileScript(Profile profile, ScriptConfiguration configuration) : base(configuration)
         {
             Profile = profile;
-            lock (Profile.Scripts)
-            {
-                Profile.Scripts.Add(this);
-            }
         }
 
         /// <summary>

src/Artemis.Core/Plugins/ScriptingProviders/Scripts/Script.cs

@@ -20,8 +20,6 @@ namespace Artemis.Core.ScriptingProviders
                 throw new ArtemisCoreException("The provided script configuration already has an active script");
 
             ScriptConfiguration = configuration;
-            ScriptConfiguration.Script = this;
-
             ScriptConfiguration.PropertyChanged += ScriptConfigurationOnPropertyChanged;
         }