Removing requirement to provide a keypair name