Clean up, and (temorary) removing roles