Add logic for the command-line only VM. The GUI VM is still the default.
Cleanups from previous changes