Removed hard-coded client_id from some urls