Remove commented heuristic