Clean-up some constants files
Merge pull request #219 from markewallace/ConstantsCleanup

Clean-up some constants files