Merge pull request #2611 from akoeplinger/cleanup