Add TropicalPaths, Cleanup