Revert 25 feature/cmdline options