removing deprecated calls