pathfinder now is class, need cleanup