Cleanup
Merge pull request #5645 from WestLangley/dev-cleanup

Code Cleanup