Clean up, updates and USB-OTG support bring up