diff --git a/DS4Windows/DS4Control/ControlService.cs b/DS4Windows/DS4Control/ControlService.cs
index 3b819ae..e8a164c 100644
--- a/DS4Windows/DS4Control/ControlService.cs
+++ b/DS4Windows/DS4Control/ControlService.cs
@@ -179,16 +179,8 @@ namespace DS4Windows
                             int xinputIndex = x360Bus.FirstController + i;
                             LogDebug("Plugging in X360 Controller #" + xinputIndex);
                             bool xinputResult = x360Bus.Plugin(i);
-                            if (xinputResult)
-                            {
-                                LogDebug("X360 Controller # " + xinputIndex + " connected");
-                                useDInputOnly[i] = false;
-                            }
-                            else
-                            {
-                                LogDebug("X360 Controller # " + xinputIndex + " failed. Using DInput only mode");
-                                useDInputOnly[i] = true;
-                            }
+                            LogDebug("X360 Controller # " + xinputIndex + " connected");
+                            useDInputOnly[i] = false;
                         }
 
                         device.Report += this.On_Report;
@@ -369,16 +361,8 @@ namespace DS4Windows
                                 int xinputIndex = x360Bus.FirstController + Index;
                                 LogDebug("Plugging in X360 Controller #" + xinputIndex);
                                 bool xinputResult = x360Bus.Plugin(Index);
-                                if (xinputResult)
-                                {
-                                    LogDebug("X360 Controller # " + xinputIndex + " connected");
-                                    useDInputOnly[Index] = false;
-                                }
-                                else
-                                {
-                                    LogDebug("X360 Controller # " + xinputIndex + " failed. Using DInput only mode");
-                                    useDInputOnly[Index] = true;
-                                }
+                                LogDebug("X360 Controller # " + xinputIndex + " connected");
+                                useDInputOnly[Index] = false;
                             }
 
                             TouchPadOn(Index, device);
@@ -625,15 +609,8 @@ namespace DS4Windows
                     {
                         bool unplugResult = x360Bus.Unplug(ind);
                         int xinputIndex = x360Bus.FirstController + ind;
-                        if (unplugResult)
-                        {
-                            LogDebug("X360 Controller # " + xinputIndex + " unplugged");
-                            useDInputOnly[ind] = true;
-                        }
-                        else
-                        {
-                            LogDebug("X360 Controller # " + xinputIndex + " failed to unplug");
-                        }
+                        LogDebug("X360 Controller # " + xinputIndex + " unplugged");
+                        useDInputOnly[ind] = true;
                     }
                 }
                 else
@@ -643,16 +620,8 @@ namespace DS4Windows
                         int xinputIndex = x360Bus.FirstController + ind;
                         LogDebug("Plugging in X360 Controller #" + xinputIndex);
                         bool xinputResult = x360Bus.Plugin(ind);
-                        if (xinputResult)
-                        {
-                            LogDebug("X360 Controller # " + xinputIndex + " connected");
-                            useDInputOnly[ind] = false;
-                        }
-                        else
-                        {
-                            LogDebug("X360 Controller # " + xinputIndex + " failed. Using DInput only mode");
-                            useDInputOnly[ind] = true;
-                        }
+                        LogDebug("X360 Controller # " + xinputIndex + " connected");
+                        useDInputOnly[ind] = false;
                     }
                 }
             }
@@ -688,14 +657,7 @@ namespace DS4Windows
                     {
                         bool unplugResult = x360Bus.Unplug(ind);
                         int xinputIndex = x360Bus.FirstController + ind;
-                        if (unplugResult)
-                        {
-                            LogDebug("X360 Controller # " + xinputIndex + " unplugged");
-                        }
-                        else
-                        {
-                            LogDebug("X360 Controller # " + xinputIndex + " failed to unplug");
-                        }
+                        LogDebug("X360 Controller # " + xinputIndex + " unplugged");
                     }
 
                     string removed = Properties.Resources.ControllerWasRemoved.Replace("*Mac address*", (ind + 1).ToString());
diff --git a/DS4Windows/DS4Control/ScpUtil.cs b/DS4Windows/DS4Control/ScpUtil.cs
index e85c3de..807a926 100644
--- a/DS4Windows/DS4Control/ScpUtil.cs
+++ b/DS4Windows/DS4Control/ScpUtil.cs
@@ -2844,20 +2844,14 @@ namespace DS4Windows
                         if (xinputStatus && xinputPlug)
                         {
                             bool xinputResult = control.x360Bus.Plugin(device);
-                            if (xinputResult)
-                            {
-                                int xinputIndex = control.x360Bus.FirstController + device;
-                                Log.LogToGui("X360 Controller # " + xinputIndex + " connected", false);
-                            }
+                            int xinputIndex = control.x360Bus.FirstController + device;
+                            Log.LogToGui("X360 Controller # " + xinputIndex + " connected", false);
                         }
                         else if (xinputStatus && !xinputPlug)
                         {
                             bool xinputResult = control.x360Bus.Unplug(device);
-                            if (xinputResult)
-                            {
-                                int xinputIndex = control.x360Bus.FirstController + device;
-                                Log.LogToGui("X360 Controller # " + xinputIndex + " unplugged", false);
-                            }
+                            int xinputIndex = control.x360Bus.FirstController + device;
+                            Log.LogToGui("X360 Controller # " + xinputIndex + " unplugged", false);
                         }
 
                         tempDev.setRumble(0, 0);