Merge pull request #4119 from stintel/cleanup