remove usage of deprecated APIs