Merge pull request #4714 from hnyman/cleanup