Cleanup subcommand options/args in CLI