improve SPTrustedIdentityTokenIssuer cleanup