Mappings remain if roles are removed manually

[mistermarco]

If an admin removes a role manually, we should remove any mapping to that role and clean up. Currently, that doesn't happen.