Merge pull request #17522 from seamuslee001/remove_deprecated_methods