Drop `PeerHolder` as it now only has one field