Remove subcommand stuff