Bring in social SSO and some clean up