improve check for USB drive, remove more stuff