diff --git a/recipe_modules/environment/options.proto b/recipe_modules/environment/options.proto
index a037cf9..adffada 100644
--- a/recipe_modules/environment/options.proto
+++ b/recipe_modules/environment/options.proto
@@ -17,23 +17,23 @@
 
 message Options {
   // Relative path to Pigweed root directory from checkout root. Not required.
-  string relative_pigweed_root = 2;
+  string relative_pigweed_root = 1;
 
   // JSON config file path relative to project root. Default: 'pigweed.json'.
-  string config_file = 3;
+  string config_file = 2;
 
   // Check if submodules are present or not.
-  bool skip_submodule_check = 4;
+  bool skip_submodule_check = 3;
 
   // Additional environment variables to set.
-  map<string, string> additional_variables = 5;
+  map<string, string> additional_variables = 4;
 
   // Additional CIPD files to use (on top of those referenced by the
   // config_file). "$PW_ROOT" will be expanded to point to the root of the
   // Pigweed repository in the checkout, using string substitution.
-  repeated string additional_cipd_files = 6;
+  repeated string additional_cipd_files = 5;
 
   // If set, failures when running 'pw doctor' will be ignored. They will still
   // show in MILO in red.
-  bool allow_doctor_to_fail = 7;
+  bool allow_doctor_to_fail = 6;
 }
diff --git a/recipe_modules/submodule_roll/tests/full.proto b/recipe_modules/submodule_roll/tests/full.proto
index 44f0f53..e193d3e 100644
--- a/recipe_modules/submodule_roll/tests/full.proto
+++ b/recipe_modules/submodule_roll/tests/full.proto
@@ -16,9 +16,7 @@
 
 package recipe_modules.pigweed.submodule_roll.tests;
 
-import "recipe_modules/pigweed/checkout/options.proto";
 import "recipe_modules/pigweed/submodule_roll/submodule.proto";
-import "recipe_modules/fuchsia/auto_roller/options.proto";
 
 message InputProperties {
   // Submodules to update.
diff --git a/recipe_modules/txt_roll/tests/full.proto b/recipe_modules/txt_roll/tests/full.proto
index 32ea70a..eae7fa1 100644
--- a/recipe_modules/txt_roll/tests/full.proto
+++ b/recipe_modules/txt_roll/tests/full.proto
@@ -16,9 +16,7 @@
 
 package recipe_modules.pigweed.txt_roll.tests;
 
-import "recipe_modules/pigweed/checkout/options.proto";
 import "recipe_modules/pigweed/txt_roll/txt_entry.proto";
-import "recipe_modules/fuchsia/auto_roller/options.proto";
 
 message InputProperties {
   // Text entries to update.
diff --git a/recipes/cipd_roller.proto b/recipes/cipd_roller.proto
index 1b39e4b..6e85c29 100644
--- a/recipes/cipd_roller.proto
+++ b/recipes/cipd_roller.proto
@@ -24,12 +24,12 @@
   repeated recipe_modules.pigweed.cipd_roll.Package packages = 1;
 
   // Checkout module options.
-  recipe_modules.pigweed.checkout.Options checkout_options = 9;
+  recipe_modules.pigweed.checkout.Options checkout_options = 2;
 
   // Auto roller module options.
-  recipe_modules.fuchsia.auto_roller.Options auto_roller_options = 10;
+  recipe_modules.fuchsia.auto_roller.Options auto_roller_options = 3;
 
   // Name to use in the commit message ("roll: <roll_name>"). Defaults to a list
   // of the basenames of package names.
-  string roll_name = 2;
+  string roll_name = 4;
 }
diff --git a/recipes/multi_roller.proto b/recipes/multi_roller.proto
index f150c4b..3a3e32a 100644
--- a/recipes/multi_roller.proto
+++ b/recipes/multi_roller.proto
@@ -16,8 +16,7 @@
 
 package recipes.pigweed.multi_roller;
 
-message Builder
-{
+message Builder {
   // Project of the builder to launch.
   // TODO: b/245788264 - Support launching builders outside the current project.
   string project = 1;
@@ -48,5 +47,4 @@
 
     // Treat "recommended" votes on labels_to_wait_on as "approved" votes.
     bool permit_recommended = 5;
-
-}
\ No newline at end of file
+}
diff --git a/recipes/pipeline.proto b/recipes/pipeline.proto
index 509b4c3..c992e74 100644
--- a/recipes/pipeline.proto
+++ b/recipes/pipeline.proto
@@ -16,8 +16,7 @@
 
 package recipes.pigweed.pipeline;
 
-message Builder
-{
+message Builder {
   // Project of the builder to launch.
   // TODO: b/245788264 - Support launching builders outside the current project.
   string project = 1;
diff --git a/recipes/repo_roller.proto b/recipes/repo_roller.proto
index d8a3944..c8d0a56 100644
--- a/recipes/repo_roller.proto
+++ b/recipes/repo_roller.proto
@@ -22,45 +22,41 @@
 
 message InputProperties {
   // Projects to update. For now, only one project is supported.
-  repeated recipe_modules.pigweed.repo_roll.Project projects = 2;
-
-  reserved 3;
+  repeated recipe_modules.pigweed.repo_roll.Project projects = 1;
 
   // Whether to CC authors and/or reviewers on roll CLs. In case the owner of a
   // CL is different from the author, both are included when
   // cc_authors_on_rolls is set.
-  bool cc_authors_on_rolls = 4;
-  bool cc_reviewers_on_rolls = 5;
+  bool cc_authors_on_rolls = 2;
+  bool cc_reviewers_on_rolls = 3;
 
   // Restrict CCing of authors/reviewers to the following domains. Including
   // "example.com" will not automatically include "subdomain.example.com". If
   // empty, all domains will included except those ending with
   // "gserviceaccount.com" are always excluded.
-  repeated string cc_domains = 6;
+  repeated string cc_domains = 4;
 
   // By default, only CC when a roll fails. If always_cc is set, CC when the
   // roll is created.
-  bool always_cc = 7;
-
-  reserved 8;
+  bool always_cc = 5;
 
   // Forge the author so rolls of single commits are attributed to the original
   // commit author.
-  bool forge_author = 9;
+  bool forge_author = 6;
 
   // Checkout module options.
-  recipe_modules.pigweed.checkout.Options checkout_options = 10;
+  recipe_modules.pigweed.checkout.Options checkout_options = 7;
 
   // Auto roller module options.
-  recipe_modules.fuchsia.auto_roller.Options auto_roller_options = 11;
+  recipe_modules.fuchsia.auto_roller.Options auto_roller_options = 8;
 
   // Overrides for auto roller module options. Needed when rollers are launched
   // via the subbuild module, which does not have a mechanism to modify an
   // existing roller's auto_roller_options (only can overwrite it).
-  recipe_modules.fuchsia.auto_roller.Options override_auto_roller_options = 13;
+  recipe_modules.fuchsia.auto_roller.Options override_auto_roller_options = 9;
 
   // Max number of commits for which authors and reviewers should be CCd.
   // Default is 10. To disable CCing, don't set the "cc_*_on_rolls" values
   // above, or set this to a negative value.
-  int32 max_commits_for_ccing = 12;
+  int32 max_commits_for_ccing = 10;
 }
diff --git a/recipes/static_checks.proto b/recipes/static_checks.proto
index 18d4b68..5285b75 100644
--- a/recipes/static_checks.proto
+++ b/recipes/static_checks.proto
@@ -35,21 +35,19 @@
   // Email addresses of accounts allowed to bypass these restrictions.
   repeated string ignored_accounts = 2;
 
-  reserved 3;
-
   // Require "Tested:" line.
-  bool require_tested = 4;
+  bool require_tested = 3;
 
   // List of extensions for documentation files. If present, CLs must modify at
   // least one file with one of these extensions.
-  repeated string doc_patterns = 5;
+  repeated string doc_patterns = 4;
 
-  repeated Readability readability = 6;
+  repeated Readability readability = 5;
 
   // Python regular expression that the commit message must match.
-  string commit_message_regexp = 7;
+  string commit_message_regexp = 6;
 
   // Message to include in case regular expression fails to match (maybe with
   // a link to example commit messages).
-  string commit_message_regexp_failure_message = 8;
+  string commit_message_regexp_failure_message = 7;
 }
diff --git a/recipes/submodule_roller.proto b/recipes/submodule_roller.proto
index 87095fd..5ad9259 100644
--- a/recipes/submodule_roller.proto
+++ b/recipes/submodule_roller.proto
@@ -24,43 +24,39 @@
   // Submodules to update.
   repeated recipe_modules.pigweed.submodule_roll.SubmoduleEntry submodules = 1;
 
-  reserved 2;
-
   // Whether to CC authors and/or reviewers on roll CLs. In case the owner of a
   // CL is different from the author, both are included when
   // cc_authors_on_rolls is set.
-  bool cc_authors_on_rolls = 3;
-  bool cc_reviewers_on_rolls = 4;
+  bool cc_authors_on_rolls = 2;
+  bool cc_reviewers_on_rolls = 3;
 
   // Restrict CCing of authors/reviewers to the following domains. Including
   // "example.com" will not automatically include "subdomain.example.com". If
   // empty, all domains will included except those ending with
   // "gserviceaccount.com" are always excluded.
-  repeated string cc_domains = 5;
+  repeated string cc_domains = 4;
 
   // By default, only CC when a roll fails. If always_cc is set, CC when the
   // roll is created.
-  bool always_cc = 6;
-
-  reserved 7;
+  bool always_cc = 5;
 
   // Checkout module options.
-  recipe_modules.pigweed.checkout.Options checkout_options = 8;
+  recipe_modules.pigweed.checkout.Options checkout_options = 6;
 
   // Forge the author so rolls of single commits are attributed to the original
   // commit author.
-  bool forge_author = 9;
+  bool forge_author = 7;
 
   // Auto roller module options.
-  recipe_modules.fuchsia.auto_roller.Options auto_roller_options = 10;
+  recipe_modules.fuchsia.auto_roller.Options auto_roller_options = 8;
 
   // Overrides for auto roller module options. Needed when rollers are launched
   // via the subbuild module, which does not have a mechanism to modify an
   // existing roller's auto_roller_options (only can overwrite it).
-  recipe_modules.fuchsia.auto_roller.Options override_auto_roller_options = 12;
+  recipe_modules.fuchsia.auto_roller.Options override_auto_roller_options = 9;
 
   // Max number of commits for which authors and reviewers should be CCd.
   // Default is 10. To disable CCing, don't set the "cc_*_on_rolls" values
   // above, or set this to a negative value.
-  int32 max_commits_for_ccing = 11;
+  int32 max_commits_for_ccing = 10;
 }
diff --git a/recipes/target_to_cipd.proto b/recipes/target_to_cipd.proto
index f56d0df..8f6235b 100644
--- a/recipes/target_to_cipd.proto
+++ b/recipes/target_to_cipd.proto
@@ -33,33 +33,33 @@
   // Globs of build artifacts to upload, relative to build directory. Should
   // resolve to files not directories. Supports "**". Required unless using
   // pw_presubmit steps, in which case the pw_presubmit export_dir_name is used.
-  repeated string artifacts = 3;
+  repeated string artifacts = 1;
 
   // Adjustments to paths as they're moved to the CIPD package. Optional.
   // Ignored if using pw_presubmit steps.
-  repeated PathReplacement replacements = 4;
+  repeated PathReplacement replacements = 2;
 
   // CIPD destination path.
-  string cipd_path = 5;
+  string cipd_path = 3;
 
   // Add platform (i.e., "linux-amd64") to package path.
-  bool add_cipd_platform = 6;
+  bool add_cipd_platform = 4;
 
   // Name of roller to trigger after uploading to CIPD. Optional.
-  string roller_name = 7;
+  string roller_name = 5;
 
   // Don't do anything that has external effects.
-  bool dry_run = 8;
+  bool dry_run = 6;
 
   // Build module options.
-  recipe_modules.pigweed.build.Options build_options = 9;
+  recipe_modules.pigweed.build.Options build_options = 7;
 
   // Environment module options.
-  recipe_modules.pigweed.environment.Options environment_options = 10;
+  recipe_modules.pigweed.environment.Options environment_options = 8;
 
   // Checkout module options.
-  recipe_modules.pigweed.checkout.Options checkout_options = 11;
+  recipe_modules.pigweed.checkout.Options checkout_options = 9;
 
   // Pw Presubmit module options.
-  recipe_modules.pigweed.pw_presubmit.Options pw_presubmit_options = 12;
+  recipe_modules.pigweed.pw_presubmit.Options pw_presubmit_options = 10;
 }