Added keypair delete function and incorporated into cleanup_env routine