Remove categories from Bazel options.

These have all had a chance to be categorized with the OptionDocumentationCategory enum, and the help output already uses the enum-grouped format.

The "incompatible changes" category has meaning for --all_incompatible_changes and will be removed separately.

RELNOTES: None.
PiperOrigin-RevId: 190773778

14 files changed, 4 insertions, 70 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandEventHandler.java b/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandEventHandler.java
index ee72a4c838..7fcbbcd95a 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandEventHandler.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandEventHandler.java
@@ -63,7 +63,6 @@ public class BlazeCommandEventHandler implements EventHandler {
     @Option(
       name = "show_progress",
       defaultValue = "true",
-      category = "verbosity",
       documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
       effectTags = {OptionEffectTag.UNKNOWN},
       help = "Display progress messages during a build."
@@ -73,7 +72,6 @@ public class BlazeCommandEventHandler implements EventHandler {
     @Option(
       name = "show_task_finish",
       defaultValue = "false",
-      category = "verbosity",
       documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
       effectTags = {OptionEffectTag.UNKNOWN},
       help = "Display progress messages when tasks complete, not just when they start."
@@ -83,7 +81,6 @@ public class BlazeCommandEventHandler implements EventHandler {
     @Option(
       name = "show_progress_rate_limit",
       defaultValue = "0.2", // A nice middle ground; snappy but not too spammy in logs.
-      category = "verbosity",
       documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
       effectTags = {OptionEffectTag.UNKNOWN},
       help = "Minimum number of seconds between progress messages in the output."
@@ -94,7 +91,6 @@ public class BlazeCommandEventHandler implements EventHandler {
       name = "color",
       defaultValue = "auto",
       converter = UseColorConverter.class,
-      category = "verbosity",
       documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
       effectTags = {OptionEffectTag.UNKNOWN},
       help = "Use terminal controls to colorize output."
@@ -105,7 +101,6 @@ public class BlazeCommandEventHandler implements EventHandler {
       name = "curses",
       defaultValue = "auto",
       converter = UseCursesConverter.class,
-      category = "verbosity",
       documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
       effectTags = {OptionEffectTag.UNKNOWN},
       help = "Use terminal cursor controls to minimize scrolling output"
@@ -154,7 +149,6 @@ public class BlazeCommandEventHandler implements EventHandler {
     @Option(
       name = "show_timestamps",
       defaultValue = "false",
-      category = "verbosity",
       documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
       effectTags = {OptionEffectTag.UNKNOWN},
       help = "Include timestamps in messages"
@@ -164,7 +158,6 @@ public class BlazeCommandEventHandler implements EventHandler {
     @Option(
       name = "progress_in_terminal_title",
       defaultValue = "false",
-      category = "verbosity",
       documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
       effectTags = {OptionEffectTag.UNKNOWN},
       help =
@@ -176,7 +169,6 @@ public class BlazeCommandEventHandler implements EventHandler {
     @Option(
       name = "experimental_external_repositories",
       defaultValue = "false",
-      category = "verbosity",
       documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
       effectTags = {OptionEffectTag.UNKNOWN},
       help = "Use external repositories for improved stability and speed when available."
@@ -186,7 +178,6 @@ public class BlazeCommandEventHandler implements EventHandler {
     @Option(
       name = "force_experimental_external_repositories",
       defaultValue = "false",
-      category = "verbosity",
       documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
       effectTags = {OptionEffectTag.UNKNOWN},
       help = "Forces --experimental_external_repositories."
@@ -196,7 +187,6 @@ public class BlazeCommandEventHandler implements EventHandler {
     @Option(
       name = "experimental_ui",
       defaultValue = "true",
-      category = "verbosity",
       documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
       effectTags = {OptionEffectTag.UNKNOWN},
       help =
@@ -218,7 +208,6 @@ public class BlazeCommandEventHandler implements EventHandler {
     @Option(
       name = "experimental_ui_actions_shown",
       defaultValue = "8",
-      category = "verbosity",
       documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
       effectTags = {OptionEffectTag.UNKNOWN},
       help =
@@ -232,7 +221,6 @@ public class BlazeCommandEventHandler implements EventHandler {
     @Option(
       name = "experimental_ui_limit_console_output",
       defaultValue = "0",
-      category = "verbosity",
       documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
       effectTags = {OptionEffectTag.UNKNOWN},
       help =
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlazeServerStartupOptions.java b/src/main/java/com/google/devtools/build/lib/runtime/BlazeServerStartupOptions.java
index a640e6ff42..aaa7f05806 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/BlazeServerStartupOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/BlazeServerStartupOptions.java
@@ -110,7 +110,6 @@ public class BlazeServerStartupOptions extends OptionsBase {
   @Option(
     name = "output_base",
     defaultValue = "null", // NOTE: purely decorative!  See class docstring.
-    category = "server startup",
     documentationCategory = OptionDocumentationCategory.BAZEL_CLIENT_OPTIONS,
     effectTags = {OptionEffectTag.AFFECTS_OUTPUTS, OptionEffectTag.LOSES_INCREMENTAL_STATE},
     converter = OptionsUtils.PathFragmentConverter.class,
@@ -131,7 +130,6 @@ public class BlazeServerStartupOptions extends OptionsBase {
   @Option(
     name = "output_user_root",
     defaultValue = "null", // NOTE: purely decorative!  See class docstring.
-    category = "server startup",
     documentationCategory = OptionDocumentationCategory.BAZEL_CLIENT_OPTIONS,
     effectTags = {OptionEffectTag.AFFECTS_OUTPUTS, OptionEffectTag.LOSES_INCREMENTAL_STATE},
     converter = OptionsUtils.PathFragmentConverter.class,
@@ -144,14 +142,13 @@ public class BlazeServerStartupOptions extends OptionsBase {
   public PathFragment outputUserRoot;
 
   /**
-   * Note: This option is only used by the C++ client, never by the Java server.
-   * It is included here to make sure that the option is documented in the help
-   * output, which is auto-generated by Java code.
+   * Note: This option is only used by the C++ client, never by the Java server. It is included here
+   * to make sure that the option is documented in the help output, which is auto-generated by Java
+   * code.
    */
   @Option(
     name = "server_jvm_out",
     defaultValue = "null", // NOTE: purely decorative!  See class docstring.
-    category = "server startup",
     documentationCategory = OptionDocumentationCategory.BAZEL_CLIENT_OPTIONS,
     effectTags = {OptionEffectTag.AFFECTS_OUTPUTS, OptionEffectTag.LOSES_INCREMENTAL_STATE},
     converter = OptionsUtils.PathFragmentConverter.class,
@@ -178,7 +175,6 @@ public class BlazeServerStartupOptions extends OptionsBase {
   @Option(
     name = "max_idle_secs",
     defaultValue = "" + (3 * 3600), // NOTE: purely decorative!  See class docstring.
-    category = "server startup",
     documentationCategory = OptionDocumentationCategory.BAZEL_CLIENT_OPTIONS,
     effectTags = {OptionEffectTag.EAGERNESS_TO_EXIT, OptionEffectTag.LOSES_INCREMENTAL_STATE},
     valueHelp = "<integer>",
@@ -191,7 +187,6 @@ public class BlazeServerStartupOptions extends OptionsBase {
   @Option(
     name = "batch",
     defaultValue = "false", // NOTE: purely decorative!  See class docstring.
-    category = "server startup",
     documentationCategory = OptionDocumentationCategory.BAZEL_CLIENT_OPTIONS,
     effectTags = {
       OptionEffectTag.LOSES_INCREMENTAL_STATE,
@@ -206,7 +201,6 @@ public class BlazeServerStartupOptions extends OptionsBase {
   @Option(
     name = "deep_execroot",
     defaultValue = "true", // NOTE: purely decorative!  See class docstring.
-    category = "server startup",
     documentationCategory = OptionDocumentationCategory.BAZEL_CLIENT_OPTIONS,
     effectTags = {OptionEffectTag.LOSES_INCREMENTAL_STATE, OptionEffectTag.EXECUTION},
     help =
@@ -218,7 +212,6 @@ public class BlazeServerStartupOptions extends OptionsBase {
   @Option(
     name = "experimental_oom_more_eagerly",
     defaultValue = "false", // NOTE: purely decorative!  See class docstring.
-    category = "server startup",
     documentationCategory = OptionDocumentationCategory.BAZEL_CLIENT_OPTIONS,
     effectTags = {OptionEffectTag.LOSES_INCREMENTAL_STATE, OptionEffectTag.EAGERNESS_TO_EXIT},
     help =
@@ -232,7 +225,6 @@ public class BlazeServerStartupOptions extends OptionsBase {
   @Option(
     name = "experimental_oom_more_eagerly_threshold",
     defaultValue = "100", // NOTE: purely decorative!  See class docstring.
-    category = "server startup",
     documentationCategory = OptionDocumentationCategory.BAZEL_CLIENT_OPTIONS,
     effectTags = {OptionEffectTag.LOSES_INCREMENTAL_STATE, OptionEffectTag.EAGERNESS_TO_EXIT},
     help =
@@ -245,7 +237,6 @@ public class BlazeServerStartupOptions extends OptionsBase {
   @Option(
     name = "block_for_lock",
     defaultValue = "true", // NOTE: purely decorative!  See class docstring.
-    category = "server startup",
     documentationCategory = OptionDocumentationCategory.BAZEL_CLIENT_OPTIONS,
     effectTags = {OptionEffectTag.EAGERNESS_TO_EXIT},
     help =
@@ -257,7 +248,6 @@ public class BlazeServerStartupOptions extends OptionsBase {
   @Option(
     name = "io_nice_level",
     defaultValue = "-1", // NOTE: purely decorative!
-    category = "server startup",
     documentationCategory = OptionDocumentationCategory.BAZEL_CLIENT_OPTIONS,
     effectTags = {OptionEffectTag.HOST_MACHINE_RESOURCE_OPTIMIZATIONS},
     valueHelp = "{-1,0,1,2,3,4,5,6,7}",
@@ -272,7 +262,6 @@ public class BlazeServerStartupOptions extends OptionsBase {
   @Option(
     name = "batch_cpu_scheduling",
     defaultValue = "false", // NOTE: purely decorative!
-    category = "server startup",
     documentationCategory = OptionDocumentationCategory.BAZEL_CLIENT_OPTIONS,
     effectTags = {OptionEffectTag.HOST_MACHINE_RESOURCE_OPTIMIZATIONS},
     help =
@@ -285,7 +274,6 @@ public class BlazeServerStartupOptions extends OptionsBase {
   @Option(
     name = "blazerc",
     defaultValue = "null", // NOTE: purely decorative!
-    category = "misc",
     documentationCategory = OptionDocumentationCategory.BAZEL_CLIENT_OPTIONS,
     effectTags = {OptionEffectTag.CHANGES_INPUTS},
     valueHelp = "<path>",
@@ -301,7 +289,6 @@ public class BlazeServerStartupOptions extends OptionsBase {
   @Option(
     name = "master_blazerc",
     defaultValue = "true", // NOTE: purely decorative!
-    category = "misc",
     documentationCategory = OptionDocumentationCategory.BAZEL_CLIENT_OPTIONS,
     effectTags = {OptionEffectTag.CHANGES_INPUTS},
     help = "If this option is false, the master %{product}rc next to the binary is not read."
@@ -333,7 +320,6 @@ public class BlazeServerStartupOptions extends OptionsBase {
   @Option(
     name = "watchfs",
     defaultValue = "false",
-    category = "server startup",
     documentationCategory = OptionDocumentationCategory.BAZEL_CLIENT_OPTIONS,
     effectTags = {OptionEffectTag.UNKNOWN},
     metadataTags = OptionMetadataTag.DEPRECATED,
@@ -397,7 +383,6 @@ public class BlazeServerStartupOptions extends OptionsBase {
   @Option(
     name = "client_debug",
     defaultValue = "false", // NOTE: purely decorative!
-    category = "server startup",
     documentationCategory = OptionDocumentationCategory.BAZEL_CLIENT_OPTIONS,
     effectTags = {OptionEffectTag.AFFECTS_OUTPUTS, OptionEffectTag.BAZEL_MONITORING},
     help =
@@ -409,7 +394,6 @@ public class BlazeServerStartupOptions extends OptionsBase {
   @Option(
     name = "connect_timeout_secs",
     defaultValue = "30",
-    category = "server startup",
     documentationCategory = OptionDocumentationCategory.BAZEL_CLIENT_OPTIONS,
     effectTags = {OptionEffectTag.BAZEL_INTERNAL_CONFIGURATION},
     help = "The amount of time the client waits for each attempt to connect to the server"
@@ -419,7 +403,6 @@ public class BlazeServerStartupOptions extends OptionsBase {
   @Option(
     name = "expand_configs_in_place",
     defaultValue = "true", // NOTE: purely decorative!
-    category = "server startup",
     documentationCategory = OptionDocumentationCategory.BAZEL_CLIENT_OPTIONS,
     effectTags = {OptionEffectTag.BAZEL_INTERNAL_CONFIGURATION, OptionEffectTag.CHANGES_INPUTS},
     metadataTags = {OptionMetadataTag.EXPERIMENTAL},
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/CommonCommandOptions.java b/src/main/java/com/google/devtools/build/lib/runtime/CommonCommandOptions.java
index ea9c7fa057..4c37fab659 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/CommonCommandOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/CommonCommandOptions.java
@@ -40,7 +40,6 @@ public class CommonCommandOptions extends OptionsBase {
   @Option(
     name = "all_incompatible_changes",
     defaultValue = "null",
-    category = "misc",
     documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
     effectTags = {OptionEffectTag.UNKNOWN},
     metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE},
@@ -54,7 +53,6 @@ public class CommonCommandOptions extends OptionsBase {
   @Option(
     name = "config",
     defaultValue = "",
-    category = "misc",
     documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
     effectTags = {OptionEffectTag.UNKNOWN},
     allowMultiple = true,
@@ -71,7 +69,6 @@ public class CommonCommandOptions extends OptionsBase {
   @Option(
     name = "logging",
     defaultValue = "3", // Level.INFO
-    category = "verbosity",
     documentationCategory = OptionDocumentationCategory.LOGGING,
     effectTags = {OptionEffectTag.AFFECTS_OUTPUTS},
     converter = Converters.LogLevelConverter.class,
@@ -93,7 +90,6 @@ public class CommonCommandOptions extends OptionsBase {
   @Option(
     name = "announce_rc",
     defaultValue = "false",
-    category = "verbosity",
     documentationCategory = OptionDocumentationCategory.LOGGING,
     effectTags = {OptionEffectTag.AFFECTS_OUTPUTS},
     help = "Whether to announce rc options."
@@ -112,7 +108,6 @@ public class CommonCommandOptions extends OptionsBase {
   @Option(
     name = "allow_undefined_configs",
     defaultValue = "true",
-    category = "flags",
     documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
     effectTags = {OptionEffectTag.EAGERNESS_TO_EXIT},
     help = "Do not throw an error when the config is not defined."
@@ -201,7 +196,6 @@ public class CommonCommandOptions extends OptionsBase {
   @Option(
     name = "profile",
     defaultValue = "null",
-    category = "misc",
     documentationCategory = OptionDocumentationCategory.LOGGING,
     effectTags = {OptionEffectTag.AFFECTS_OUTPUTS, OptionEffectTag.BAZEL_MONITORING},
     converter = OptionsUtils.PathFragmentConverter.class,
@@ -293,7 +287,6 @@ public class CommonCommandOptions extends OptionsBase {
   @Option(
     name = "tool_tag",
     defaultValue = "",
-    category = "misc",
     documentationCategory = OptionDocumentationCategory.LOGGING,
     effectTags = {OptionEffectTag.AFFECTS_OUTPUTS, OptionEffectTag.BAZEL_MONITORING},
     help = "A tool name to attribute this Blaze invocation to."
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/HostJvmStartupOptions.java b/src/main/java/com/google/devtools/build/lib/runtime/HostJvmStartupOptions.java
index 3a6a3dde16..7e02b253ee 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/HostJvmStartupOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/HostJvmStartupOptions.java
@@ -32,7 +32,6 @@ public class HostJvmStartupOptions extends OptionsBase {
   @Option(
     name = "host_javabase",
     defaultValue = "", // NOTE: purely decorative! See BlazeServerStartupOptions.
-    category = "host jvm startup",
     valueHelp = "<jvm path>",
     documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
     effectTags = {OptionEffectTag.UNKNOWN},
@@ -43,7 +42,6 @@ public class HostJvmStartupOptions extends OptionsBase {
   @Option(
     name = "host_jvm_args",
     defaultValue = "", // NOTE: purely decorative!  See BlazeServerStartupOptions.
-    category = "host jvm startup",
     allowMultiple = true,
     valueHelp = "<jvm_arg>",
     documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
@@ -55,7 +53,6 @@ public class HostJvmStartupOptions extends OptionsBase {
   @Option(
     name = "host_jvm_profile",
     defaultValue = "", // NOTE: purely decorative!  See BlazeServerStartupOptions.
-    category = "host jvm startup",
     valueHelp = "<profiler_name>",
     documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
     effectTags = {OptionEffectTag.UNKNOWN},
@@ -69,7 +66,6 @@ public class HostJvmStartupOptions extends OptionsBase {
   @Option(
     name = "host_jvm_debug",
     defaultValue = "null", // NOTE: purely decorative!  See BlazeServerStartupOptions.
-    category = "host jvm startup",
     documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
     effectTags = {OptionEffectTag.UNKNOWN},
     help =
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/KeepGoingOption.java b/src/main/java/com/google/devtools/build/lib/runtime/KeepGoingOption.java
index bad70e2295..7468bb7507 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/KeepGoingOption.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/KeepGoingOption.java
@@ -24,7 +24,6 @@ public class KeepGoingOption extends OptionsBase {
     name = "keep_going",
     abbrev = 'k',
     defaultValue = "false",
-    category = "strategy",
     documentationCategory = OptionDocumentationCategory.EXECUTION_STRATEGY,
     effectTags = {OptionEffectTag.EAGERNESS_TO_EXIT},
     help =
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/TerminalTestResultNotifier.java b/src/main/java/com/google/devtools/build/lib/runtime/TerminalTestResultNotifier.java
index 4cf3567fc5..320cc54e64 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/TerminalTestResultNotifier.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/TerminalTestResultNotifier.java
@@ -55,7 +55,6 @@ public class TerminalTestResultNotifier implements TestResultNotifier {
     @Option(
       name = "verbose_test_summary",
       defaultValue = "true",
-      category = "verbosity",
       documentationCategory = OptionDocumentationCategory.LOGGING,
       effectTags = {OptionEffectTag.AFFECTS_OUTPUTS},
       help =
@@ -67,7 +66,6 @@ public class TerminalTestResultNotifier implements TestResultNotifier {
     @Option(
       name = "test_verbose_timeout_warnings",
       defaultValue = "false",
-      category = "verbosity",
       documentationCategory = OptionDocumentationCategory.LOGGING,
       effectTags = {OptionEffectTag.AFFECTS_OUTPUTS},
       help =
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/commands/CanonicalizeCommand.java b/src/main/java/com/google/devtools/build/lib/runtime/commands/CanonicalizeCommand.java
index d17b281fbb..1a450b7fad 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/commands/CanonicalizeCommand.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/commands/CanonicalizeCommand.java
@@ -55,7 +55,6 @@ public final class CanonicalizeCommand implements BlazeCommand {
     @Option(
       name = "for_command",
       defaultValue = "build",
-      category = "misc",
       documentationCategory = OptionDocumentationCategory.GENERIC_INPUTS,
       effectTags = {OptionEffectTag.AFFECTS_OUTPUTS, OptionEffectTag.TERMINAL_OUTPUT},
       help = "The command for which the options should be canonicalized."
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/commands/CleanCommand.java b/src/main/java/com/google/devtools/build/lib/runtime/commands/CleanCommand.java
index 368a5b362b..d848d47469 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/commands/CleanCommand.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/commands/CleanCommand.java
@@ -60,7 +60,6 @@ public final class CleanCommand implements BlazeCommand {
     @Option(
       name = "expunge",
       defaultValue = "false",
-      category = "clean",
       documentationCategory = OptionDocumentationCategory.OUTPUT_SELECTION,
       effectTags = {OptionEffectTag.HOST_MACHINE_RESOURCE_OPTIMIZATIONS},
       help =
@@ -73,7 +72,6 @@ public final class CleanCommand implements BlazeCommand {
     @Option(
       name = "expunge_async",
       defaultValue = "null",
-      category = "clean",
       expansion = {"--expunge", "--async"},
       documentationCategory = OptionDocumentationCategory.OUTPUT_SELECTION,
       effectTags = {OptionEffectTag.HOST_MACHINE_RESOURCE_OPTIMIZATIONS},
@@ -89,7 +87,6 @@ public final class CleanCommand implements BlazeCommand {
     @Option(
       name = "async",
       defaultValue = "false",
-      category = "clean",
       documentationCategory = OptionDocumentationCategory.OUTPUT_SELECTION,
       effectTags = {OptionEffectTag.HOST_MACHINE_RESOURCE_OPTIMIZATIONS},
       help =
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/commands/DumpCommand.java b/src/main/java/com/google/devtools/build/lib/runtime/commands/DumpCommand.java
index b7605e4b87..cadda32a2d 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/commands/DumpCommand.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/commands/DumpCommand.java
@@ -78,7 +78,6 @@ public class DumpCommand implements BlazeCommand {
     @Option(
       name = "packages",
       defaultValue = "false",
-      category = "verbosity",
       documentationCategory = OptionDocumentationCategory.OUTPUT_SELECTION,
       effectTags = {OptionEffectTag.BAZEL_MONITORING},
       help = "Dump package cache content."
@@ -88,7 +87,6 @@ public class DumpCommand implements BlazeCommand {
     @Option(
       name = "action_cache",
       defaultValue = "false",
-      category = "verbosity",
       documentationCategory = OptionDocumentationCategory.OUTPUT_SELECTION,
       effectTags = {OptionEffectTag.BAZEL_MONITORING},
       help = "Dump action cache content."
@@ -98,7 +96,6 @@ public class DumpCommand implements BlazeCommand {
     @Option(
       name = "action_graph",
       defaultValue = "null",
-      category = "verbosity",
       documentationCategory = OptionDocumentationCategory.OUTPUT_SELECTION,
       effectTags = {OptionEffectTag.BAZEL_MONITORING},
       help = "Dump action graph to the specified path."
@@ -109,7 +106,6 @@ public class DumpCommand implements BlazeCommand {
       name = "action_graph:targets",
       converter = CommaSeparatedOptionListConverter.class,
       defaultValue = "...",
-      category = "verbosity",
       documentationCategory = OptionDocumentationCategory.OUTPUT_SELECTION,
       effectTags = {OptionEffectTag.BAZEL_MONITORING},
       help =
@@ -121,7 +117,6 @@ public class DumpCommand implements BlazeCommand {
     @Option(
       name = "action_graph:include_cmdline",
       defaultValue = "false",
-      category = "verbosity",
       documentationCategory = OptionDocumentationCategory.OUTPUT_SELECTION,
       effectTags = {OptionEffectTag.BAZEL_MONITORING},
       help =
@@ -133,7 +128,6 @@ public class DumpCommand implements BlazeCommand {
     @Option(
       name = "rule_classes",
       defaultValue = "false",
-      category = "verbosity",
       documentationCategory = OptionDocumentationCategory.OUTPUT_SELECTION,
       effectTags = {OptionEffectTag.BAZEL_MONITORING},
       help = "Dump rule classes."
@@ -143,7 +137,6 @@ public class DumpCommand implements BlazeCommand {
     @Option(
       name = "rules",
       defaultValue = "false",
-      category = "verbosity",
       documentationCategory = OptionDocumentationCategory.OUTPUT_SELECTION,
       effectTags = {OptionEffectTag.BAZEL_MONITORING},
       help = "Dump rules, including counts and memory usage (if memory is tracked)."
@@ -153,7 +146,6 @@ public class DumpCommand implements BlazeCommand {
     @Option(
       name = "skylark_memory",
       defaultValue = "null",
-      category = "verbosity",
       documentationCategory = OptionDocumentationCategory.OUTPUT_SELECTION,
       effectTags = {OptionEffectTag.BAZEL_MONITORING},
       help =
@@ -165,7 +157,6 @@ public class DumpCommand implements BlazeCommand {
     @Option(
       name = "skyframe",
       defaultValue = "off",
-      category = "verbosity",
       converter = SkyframeDumpEnumConverter.class,
       documentationCategory = OptionDocumentationCategory.OUTPUT_SELECTION,
       effectTags = {OptionEffectTag.BAZEL_MONITORING},
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/commands/InfoCommand.java b/src/main/java/com/google/devtools/build/lib/runtime/commands/InfoCommand.java
index 753f6def36..aa6cd6eaf4 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/commands/InfoCommand.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/commands/InfoCommand.java
@@ -68,7 +68,6 @@ public class InfoCommand implements BlazeCommand {
     @Option(
       name = "show_make_env",
       defaultValue = "false",
-      category = "misc",
       documentationCategory = OptionDocumentationCategory.LOGGING,
       effectTags = {OptionEffectTag.AFFECTS_OUTPUTS, OptionEffectTag.TERMINAL_OUTPUT},
       help = "Include the \"Make\" environment in the output."
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/commands/PrintActionCommand.java b/src/main/java/com/google/devtools/build/lib/runtime/commands/PrintActionCommand.java
index c6eb0a3f9d..9b61941914 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/commands/PrintActionCommand.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/commands/PrintActionCommand.java
@@ -90,7 +90,6 @@ public final class PrintActionCommand implements BlazeCommand {
       name = "print_action_mnemonics",
       allowMultiple = true,
       defaultValue = "",
-      category = "print_action",
       documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
       effectTags = {OptionEffectTag.UNKNOWN},
       help =
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/commands/RunCommand.java b/src/main/java/com/google/devtools/build/lib/runtime/commands/RunCommand.java
index fea730fbdd..66b4e676e0 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/commands/RunCommand.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/commands/RunCommand.java
@@ -110,9 +110,8 @@ public class RunCommand implements BlazeCommand  {
   public static class RunOptions extends OptionsBase {
     @Option(
       name = "direct_run",
-      category = "run",
       defaultValue = "false",
-      documentationCategory =  OptionDocumentationCategory.OUTPUT_PARAMETERS,
+      documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS,
       effectTags = {OptionEffectTag.EXECUTION},
       help = "If set, the 'run' command will execute the binary to be executed in the terminal "
           + "where the command was called. Otherwise, it'll be executed as a child of the server "
@@ -123,7 +122,6 @@ public class RunCommand implements BlazeCommand  {
 
     @Option(
       name = "script_path",
-      category = "run",
       defaultValue = "null",
       documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS,
       effectTags = {OptionEffectTag.AFFECTS_OUTPUTS, OptionEffectTag.EXECUTION},
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/commands/ShutdownCommand.java b/src/main/java/com/google/devtools/build/lib/runtime/commands/ShutdownCommand.java
index 4808b39b24..20476795b2 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/commands/ShutdownCommand.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/commands/ShutdownCommand.java
@@ -42,7 +42,6 @@ public final class ShutdownCommand implements BlazeCommand {
     @Option(
       name = "iff_heap_size_greater_than",
       defaultValue = "0",
-      category = "misc",
       documentationCategory = OptionDocumentationCategory.OUTPUT_SELECTION,
       effectTags = {OptionEffectTag.LOSES_INCREMENTAL_STATE, OptionEffectTag.EAGERNESS_TO_EXIT},
       help =
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/mobileinstall/MobileInstallCommand.java b/src/main/java/com/google/devtools/build/lib/runtime/mobileinstall/MobileInstallCommand.java
index 8c8aa087a9..c65b401c12 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/mobileinstall/MobileInstallCommand.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/mobileinstall/MobileInstallCommand.java
@@ -112,7 +112,6 @@ public class MobileInstallCommand implements BlazeCommand {
     @Option(
       name = "split_apks",
       defaultValue = "false",
-      category = "mobile-install",
       documentationCategory = OptionDocumentationCategory.OUTPUT_SELECTION,
       effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS, OptionEffectTag.AFFECTS_OUTPUTS},
       help =
@@ -124,10 +123,8 @@ public class MobileInstallCommand implements BlazeCommand {
 
     @Option(
       name = "incremental",
-      category = "mobile-install",
       defaultValue = "false",
       documentationCategory = OptionDocumentationCategory.OUTPUT_SELECTION,
-
       effectTags = OptionEffectTag.LOADING_AND_ANALYSIS,
       help =
           "Whether to do an incremental install. If true, try to avoid unnecessary additional "
@@ -139,7 +136,6 @@ public class MobileInstallCommand implements BlazeCommand {
 
     @Option(
       name = "mode",
-      category = "mobile-install",
       defaultValue = "classic",
       converter = ModeConverter.class,
       documentationCategory = OptionDocumentationCategory.EXECUTION_STRATEGY,
@@ -156,7 +152,6 @@ public class MobileInstallCommand implements BlazeCommand {
 
     @Option(
       name = "mobile_install_aspect",
-      category = "mobile-install",
       defaultValue = "@android_test_support//tools/android/mobile_install:mobile-install.bzl",
       documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
       effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS, OptionEffectTag.CHANGES_INPUTS},