Remove unneeded clientId