Remove usage of own deprecated APIs.