Stop using commander objects for options