Remove unnecessary fields from match struct