better issuer cleanup