cleaning up cb_client