P2Pv2 cleanup