Documentation, cleanup in pathway.v2