[3.9] Remove sso