Started removing extra_roles and extra_groups.