sipmlify option handling

only pass options to commandline that have actually been supplied