Remove getValues from numeric and string field data & clean up geo field data