Merge pull request #1652 from John3/cleanup_unused