Attempt to clean up pathfinder