Merge pull request #2997 from RandomShaper/remove_unused