diff --git a/src/Artemis.Core/Plugins/PluginFeature.cs b/src/Artemis.Core/Plugins/PluginFeature.cs
index 149d42632..7d58d31cb 100644
--- a/src/Artemis.Core/Plugins/PluginFeature.cs
+++ b/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)