[uknown_field] code cleanup