remove unused defines, refactor vbus power enum