usb: host: cleanup from merge