remove the final constant usage from across the app
Merge pull request #1966 from rossriley/constants-are-changing

remove the final constant usage from across the app