usb cleanups