Adding pubkey alias, removing some I don't use