remove #raw_fields