Removing references to deprecated API and the deprecated API itself.
2 files changed