usb, some cleanup