Remove custom_values because they are flattened, not dedicated fields.