Code cleanup: removing last P2P types and variables

Bug: 335639730
Change-Id: I6428c2d0ce780e2ec18abfbba074fe5e67fcfbda
5 files changed