streamline failure path in code
remove unused defines, refactor vbus power enum
Merge branch 'xxxajk'