Don't remove the clientId