cleanup
Merge pull request #2153 from stefanpenner/cleanup

cleanup