Another subcommands cleanup;