Cleanup mikep7 modifications
USB fixes