removed tenantizing stuff and added disableSso flag