Re added usb clean up code