Make routed pings use pubkeyhash, not identity.
Delete more uses of identity
And another one.
On new nodes, set the identity to be equal to the pubKeyHash.