Remove redundant checks in Pathfinder