removing depreciated functions