SSO Client Refactoring, deletes