Removed traces of client_id