Remove some deprecated calls