Index: /trunk/src/VBox/ValidationKit/tests/usb/Makefile.kmk
===================================================================
--- /trunk/src/VBox/ValidationKit/tests/usb/Makefile.kmk	(revision 60488)
+++ /trunk/src/VBox/ValidationKit/tests/usb/Makefile.kmk	(revision 60489)
@@ -34,6 +34,5 @@
 ValidationKitTestsUsb_EXEC_SOURCES := \
 	$(PATH_SUB_CURRENT)/tdUsb1.py \
-	$(PATH_SUB_CURRENT)/usbgadget.py \
-	$(PATH_SUB_CURRENT)/usbgadget2.py
+	$(PATH_SUB_CURRENT)/usbgadget.py
 
 VBOX_VALIDATIONKIT_PYTHON_SOURCES += $(ValidationKitTestsUsb_EXEC_SOURCES)
Index: /trunk/src/VBox/ValidationKit/tests/usb/usbgadget2.py
===================================================================
--- /trunk/src/VBox/ValidationKit/tests/usb/usbgadget2.py	(revision 60488)
+++ /trunk/src/VBox/ValidationKit/tests/usb/usbgadget2.py	(revision 60489)
@@ -32,5 +32,4 @@
 import array
 import errno
-import os
 import select
 import socket
@@ -39,5 +38,4 @@
 import types
 import zlib
-import uuid
 
 # Validation Kit imports.
@@ -751,5 +749,5 @@
         if fRc is True:
             fRc = self.recvAckLogged("GDGTCRT");
-        return rc;
+        return fRc;
 
     def taskGadgetDestroy(self, iGadgetId):
@@ -758,5 +756,5 @@
         if fRc is True:
             fRc = self.recvAckLogged("GDGTDTOR");
-        return rc;
+        return fRc;
 
     def taskGadgetConnect(self, iGadgetId):
@@ -765,5 +763,5 @@
         if fRc is True:
             fRc = self.recvAckLogged("GDGTCNCT");
-        return rc;
+        return fRc;
 
     def taskGadgetDisconnect(self, iGadgetId):
@@ -772,5 +770,5 @@
         if fRc is True:
             fRc = self.recvAckLogged("GDGTDCNT");
-        return rc;
+        return fRc;
 
     #