Clean up tracking of matches