No more public_keys, only use the public/private keypair now