Remove more deprecated calls