commented out clearing of custom_fields in extract_custom_fields method