Get rid of record_assign_client