Merge pull request #4934 from kurund/cleanup