usbutils remove old code added back