Merge "Add cleanup after creating keypair"