Project cleanup

src/Artemis.Core/Services/CoreService.cs

@@ -55,6 +55,16 @@ namespace Artemis.Core.Services
 
         public bool IsInitialized { get; set; }
 
+        protected virtual void OnFrameRendering(FrameRenderingEventArgs e)
+        {
+            FrameRendering?.Invoke(this, e);
+        }
+
+        protected virtual void OnFrameRendered(FrameRenderedEventArgs e)
+        {
+            FrameRendered?.Invoke(this, e);
+        }
+
         private void ConfigureJsonConvert()
         {
             JsonConvert.DefaultSettings = () => new JsonSerializerSettings
@@ -136,16 +146,6 @@ namespace Artemis.Core.Services
             OnFrameRendered(new FrameRenderedEventArgs(_rgbService.BitmapBrush, _rgbService.Surface));
         }
 
-        protected virtual void OnFrameRendering(FrameRenderingEventArgs e)
-        {
-            FrameRendering?.Invoke(this, e);
-        }
-
-        protected virtual void OnFrameRendered(FrameRenderedEventArgs e)
-        {
-            FrameRendered?.Invoke(this, e);
-        }
-
         #region Events
 
         public event EventHandler Initialized;

src/Artemis.Core/Services/SettingsService.cs

@@ -1,5 +1,4 @@
-using System;
-using Artemis.Core.Plugins.Models;
+using Artemis.Core.Plugins.Models;
 using Artemis.Core.Services.Interfaces;
 using Artemis.Storage.Repositories.Interfaces;