diff --git a/DS4Windows/DS4Control/ScpDevice.Designer.cs b/DS4Windows/DS4Control/ScpDevice.Designer.cs
deleted file mode 100644
index f1f8f1e..0000000
--- a/DS4Windows/DS4Control/ScpDevice.Designer.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-namespace DS4Windows
-{
-    partial class ScpDevice
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary> 
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Component Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            components = new System.ComponentModel.Container();
-        }
-
-        #endregion
-    }
-}
diff --git a/DS4Windows/DS4Control/ScpDevice.cs b/DS4Windows/DS4Control/ScpDevice.cs
index bc22c4b..19eabfa 100644
--- a/DS4Windows/DS4Control/ScpDevice.cs
+++ b/DS4Windows/DS4Control/ScpDevice.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 
 using System.Runtime.InteropServices;
 using System.Security;
@@ -9,7 +8,7 @@ using Microsoft.Win32.SafeHandles;
 namespace DS4Windows 
 {
     [SuppressUnmanagedCodeSecurity]
-    public partial class ScpDevice : Component 
+    public class ScpDevice
     {
         public virtual Boolean IsActive 
         {
@@ -21,23 +20,8 @@ namespace DS4Windows
             get { return m_Path; }
         }
 
-
-        public ScpDevice() 
-        {
-            InitializeComponent();
-        }
-
-        public ScpDevice(IContainer container) 
-        {
-            container.Add(this);
-
-            InitializeComponent();
-        }
-
         public ScpDevice(String Class) 
         {
-            InitializeComponent();
-
             this.m_Class = new Guid(Class);
         }
 
diff --git a/DS4Windows/DS4Control/X360Device.cs b/DS4Windows/DS4Control/X360Device.cs
index e3dd1fb..f5f02f8 100644
--- a/DS4Windows/DS4Control/X360Device.cs
+++ b/DS4Windows/DS4Control/X360Device.cs
@@ -1,13 +1,12 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 
 using System.Runtime.InteropServices;
 using Microsoft.Win32.SafeHandles;
 
 namespace DS4Windows
 {
-    public partial class X360Device : ScpDevice
+    public class X360Device : ScpDevice
     {
         private const String DS3_BUS_CLASS_GUID = "{F679F562-3164-42CE-A4DB-E7DDBE723909}";
         private const int CONTROLLER_OFFSET = 1; // Device 0 is the virtual USB hub itself, and we leave devices 1-10 available for other software (like the Scarlet.Crush DualShock driver itself)
@@ -41,18 +40,8 @@ namespace DS4Windows
         public X360Device()
             : base(DS3_BUS_CLASS_GUID)
         {
-            InitializeComponent();
         }
 
-        public X360Device(IContainer container)
-            : base(DS3_BUS_CLASS_GUID)
-        {
-            container.Add(this);
-
-            InitializeComponent();
-        }
-
-
         /* public override Boolean Open(int Instance = 0)
         {
             if (base.Open(Instance))
diff --git a/DS4Windows/DS4Control/X360Device.designer.cs b/DS4Windows/DS4Control/X360Device.designer.cs
deleted file mode 100644
index e4bb678..0000000
--- a/DS4Windows/DS4Control/X360Device.designer.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-namespace DS4Windows
-{
-    partial class X360Device
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary> 
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Component Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            components = new System.ComponentModel.Container();
-        }
-
-        #endregion
-    }
-}
diff --git a/DS4Windows/DS4Windows.csproj b/DS4Windows/DS4Windows.csproj
index 2ea8861..b86cc0c 100644
--- a/DS4Windows/DS4Windows.csproj
+++ b/DS4Windows/DS4Windows.csproj
@@ -137,20 +137,10 @@
     <Compile Include="DS4Control\Mouse.cs" />
     <Compile Include="DS4Control\MouseCursor.cs" />
     <Compile Include="DS4Control\MouseWheel.cs" />
-    <Compile Include="DS4Control\ScpDevice.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="DS4Control\ScpDevice.Designer.cs">
-      <DependentUpon>ScpDevice.cs</DependentUpon>
-    </Compile>
+    <Compile Include="DS4Control\ScpDevice.cs" />
     <Compile Include="DS4Control\ScpUtil.cs" />
     <Compile Include="DS4Control\UdpServer.cs" />
-    <Compile Include="DS4Control\X360Device.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="DS4Control\X360Device.designer.cs">
-      <DependentUpon>X360Device.cs</DependentUpon>
-    </Compile>
+    <Compile Include="DS4Control\X360Device.cs" />
     <Compile Include="DS4Forms\LanguagePackComboBox.cs">
       <SubType>UserControl</SubType>
     </Compile>