Removed more of the keypair stuff.