Remove some deprecated calls.