diff --git a/DS4Windows/DS4Control/ControlService.cs b/DS4Windows/DS4Control/ControlService.cs
index ae43ac1..3c4ff38 100644
--- a/DS4Windows/DS4Control/ControlService.cs
+++ b/DS4Windows/DS4Control/ControlService.cs
@@ -382,7 +382,7 @@ namespace DS4Windows
                             LoadProfile(Index, false, this, false, false);
                             touchPad[Index] = new Mouse(Index, device);
                             device.LightBarColor = getMainColor(Index);
-                            //device.Report += this.On_Report;
+
                             int tempIdx = Index;
                             device.Report += (sender, e) =>
                             {
@@ -759,15 +759,6 @@ namespace DS4Windows
         {
             DS4Device device = (DS4Device)sender;
 
-            /*int ind = -1;
-            for (int i = 0, arlength = DS4_CONTROLLER_COUNT; ind == -1 && i < arlength; i++)
-            {
-                DS4Device tempDev = DS4Controllers[i];
-                if (tempDev != null && device == tempDev)
-                    ind = i;
-            }
-            */
-
             if (ind != -1)
             {
                 if (getFlushHIDQueue(ind))
diff --git a/TODO.md b/TODO.md
index e256f9f..ae89e3e 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,7 +1,7 @@
 # TODO
 
 * Perform some final cleanup and release version 1.5
-* Attempt to work out BT disconnect issues by looking at older versions
+* ~~Attempt to work out BT disconnect issues by looking at older versions~~
 * Attempt to remove reliance on the main thread when disconnecting a device.
 Currently used to delay hotplug routine
 * Look into distributing profile properties around various objects
@@ -12,4 +12,4 @@ any speed difference will make up for it.
 Use newer standards (WPF) and bundle app with DS4Windows
 * ~~Attempt to no longer disable service when changing dinput only option
 in profiles
-* Update Task Scheduler to latest version
+* ~~Update Task Scheduler to latest version~~