Clean up subcommand dependencies