OEC-42 Cleanup in prep for pull request