sso integration, cleanups