usb fix and cleanup