Remove old clientId helper