(QE-56) remove deprecated command line options, alter confusing options