Added support to remove certain affiliations