Some work on Logout to support SAML