Small cleanup of the PathFinder
Extract PathFinder dataSource