Beginning work on p2p cleanup