Remove use of deprecated APIs

:rotating_light: WIP :rotating_light: