Clean up user version constants

- Two global constants unused outside of this class so removed
- Shorten name since MW and USER are redundant since it's in a class
- Use class constant instead of global define consistently

Change-Id: I0e8b05372512de568a230a6e5026751aa37c4c4e
Merge "Clean up user version constants"