Remove deprecated calls.