Remove unused fields in SearchClient