Switch over to new format + clean up matches