Remove some others deprecated calls