Merge branch 'master' into develop
Removed dangling file that added a top level constant, and some code comments that were unnecessary.
Merge branch 'develop'