It looks like clientWrapper is no longer used, get rid of this.