Remove usb-controller dependency (#1007)