Clean up and adjust USB mode

Change-Id: If6e2873ddf1364d87a3a7aa4d8c88373eca5ebc3