Removed references to helpers functions