cleanups redux
Merge pull request #2226 from devoncarew/devoncarew_cleanups

cleanups redux