Deleted some more deprecated APIs