more work on saml cleanup