fuji: cleanup usb storage handling