cleanup
Merge pull request #619 from davherrmann/cleanup

cleanup