diff --git a/BTD.cpp b/BTD.cpp
index 0495689c..62a96b70 100755
--- a/BTD.cpp
+++ b/BTD.cpp
@@ -251,13 +251,7 @@ uint8_t BTD::Init(uint8_t parent, uint8_t port, bool lowspeed) {
         }
         return 0; // Successful configuration
 
-        /* diagnostic messages */
-#ifdef DEBUG_USB_HOST
-FailGetDevDescr:
-        NotifyFailGetDevDescr();
-        goto Fail;
-#endif
-
+        /* Diagnostic messages */
 FailSetDevTblEntry:
 #ifdef DEBUG_USB_HOST
         NotifyFailSetDevTblEntry();
diff --git a/XBOXRECV.cpp b/XBOXRECV.cpp
index a6d79091..8e4008a3 100644
--- a/XBOXRECV.cpp
+++ b/XBOXRECV.cpp
@@ -275,12 +275,6 @@ FailSetConfDescr:
         NotifyFailSetConfDescr();
 #endif
 
-#ifdef DEBUG_USB_HOST
-FailUnknownDevice:
-        NotifyFailUnknownDevice(VID,PID);
-#endif
-        rcode = USB_DEV_CONFIG_ERROR_DEVICE_NOT_SUPPORTED;
-
 Fail:
 #ifdef DEBUG_USB_HOST
         Notify(PSTR("\r\nXbox 360 Init Failed, error code: "), 0x80);