Removed Location; Fixed StraightLineHeuristic