Simplified script to remove secondary agent
Simplified script to remove secondary agent

This should not change behaviour at all, other than to remove the
extraneous question. This should not change any of the issues noticed
by Greg. But it should make it easier to track them down.

marrero984/education-builds,samuelson/puppetlabs-training-bootstrap,carthik/puppetlabs-training-bootstrap,carthik/puppetlabs-training-bootstrap,joshsamuelson/puppetlabs-training-bootstrap,samuelson/education-builds,joshsamuelson/puppetlabs-training-bootstrap,samuelson/puppetlabs-training-bootstrap,marrero984/education-builds,carthik/puppetlabs-training-bootstrap,kjhenner/puppetlabs-training-bootstrap,samuelson/education-builds,samuelson/puppetlabs-training-bootstrap,johnduarte/puppetlabs-training-bootstrap,johnduarte/puppetlabs-training-bootstrap,puppetlabs/puppetlabs-training-bootstrap,samuelson/education-builds,marrero984/education-builds,johnduarte/puppetlabs-training-bootstrap,puppetlabs/puppetlabs-training-bootstrap,kjhenner/puppetlabs-training-bootstrap,joshsamuelson/puppetlabs-training-bootstrap,kjhenner/puppetlabs-training-bootstrap,puppetlabs/puppetlabs-training-bootstrap