Remove client_id logic