root: Clean up init.usb, etc

Change-Id: Ibd22f6e785ba39db74ddf4ff62723eb1e36a7c21