Removed the matches variable from find_by_heuristics without re-breaking anything