Removing deprecation