remove PVStack infrastructure
fix pv capture