Remove unused property and check if p2p is used