Comment out duplicating of matches for now