Removing depreciated code helpers.