clean up goal heuristics bug fix