remove normalize_field_name()