Merge pull request #21086 from colemanw/removeUnusedCode