NxMatchInfo redesign: clean up