Merge "P2p cleanup"