Remove client-id field