cleanup
Merge pull request #1919 from danmcp/master

Cleanup