SSO: Code cleanup, remove unused code.