diff --git a/Library/Homebrew/cask/dsl/version.rb b/Library/Homebrew/cask/dsl/version.rb
index cc20fb429d..c2cbbd8224 100644
--- a/Library/Homebrew/cask/dsl/version.rb
+++ b/Library/Homebrew/cask/dsl/version.rb
@@ -153,14 +153,14 @@ module Cask
       # @api public
       sig { returns(T.self_type) }
       def before_colon
-        # odeprecated "Cask::DSL::Version#before_colon", "Cask::DSL::Version#csv"
+        odeprecated "Cask::DSL::Version#before_colon", "Cask::DSL::Version#csv"
         version { split(":", 2).first }
       end
 
       # @api public
       sig { returns(T.self_type) }
       def after_colon
-        # odeprecated "Cask::DSL::Version#after_colon", "Cask::DSL::Version#csv"
+        odeprecated "Cask::DSL::Version#after_colon", "Cask::DSL::Version#csv"
         version { split(":", 2).second }
       end
 
diff --git a/Library/Homebrew/cli/named_args.rb b/Library/Homebrew/cli/named_args.rb
index f5bf30eb67..3e1fd33e68 100644
--- a/Library/Homebrew/cli/named_args.rb
+++ b/Library/Homebrew/cli/named_args.rb
@@ -109,9 +109,6 @@ module Homebrew
               resolve_latest_keg(name)
             when :default_kegs
               resolve_default_keg(name)
-            when :keg
-              odisabled "`load_formula_or_cask` with `method: :keg`",
-                        "`load_formula_or_cask` with `method: :default_kegs`"
             when :kegs
               _, kegs = resolve_kegs(name)
               kegs
diff --git a/Library/Homebrew/cmd/list.rb b/Library/Homebrew/cmd/list.rb
index 57b97cc416..4223610621 100644
--- a/Library/Homebrew/cmd/list.rb
+++ b/Library/Homebrew/cmd/list.rb
@@ -24,9 +24,6 @@ module Homebrew
              description: "List only formulae, or treat all named arguments as formulae."
       switch "--cask", "--casks",
              description: "List only casks, or treat all named arguments as casks."
-      switch "--unbrewed",
-             description: "List files in Homebrew's prefix not installed by Homebrew.",
-             replacement: "`brew --prefix --unbrewed`"
       switch "--full-name",
              description: "Print formulae with fully-qualified names. Unless `--full-name`, `--versions` "\
                           "or `--pinned` are passed, other options (i.e. `-1`, `-l`, `-r` and `-t`) are "\
@@ -59,11 +56,7 @@ module Homebrew
       conflicts "--pinned", "--multiple"
       conflicts "--pinned", "--cask"
       conflicts "--cask", "--multiple"
-      ["--formula", "--cask", "--full-name", "--versions", "--pinned"].each do |flag|
-        conflicts "--unbrewed", flag
-      end
       ["-1", "-l", "-r", "-t"].each do |flag|
-        conflicts "--unbrewed", flag
         conflicts "--versions", flag
         conflicts "--pinned", flag
       end
diff --git a/Library/Homebrew/dev-cmd/bump-cask-pr.rb b/Library/Homebrew/dev-cmd/bump-cask-pr.rb
index 94d8b17781..877882ff95 100644
--- a/Library/Homebrew/dev-cmd/bump-cask-pr.rb
+++ b/Library/Homebrew/dev-cmd/bump-cask-pr.rb
@@ -62,7 +62,7 @@ module Homebrew
   def bump_cask_pr
     args = bump_cask_pr_args.parse
 
-    odeprecated "`brew bump-cask-pr --write`", "`brew bump-cask-pr --write-only`" if args.write?
+    odisabled "`brew bump-cask-pr --write`", "`brew bump-cask-pr --write-only`" if args.write?
 
     # This will be run by `brew style` later so run it first to not start
     # spamming during normal output.
diff --git a/Library/Homebrew/dev-cmd/pr-automerge.rb b/Library/Homebrew/dev-cmd/pr-automerge.rb
index 749d6fb991..337ff07b44 100644
--- a/Library/Homebrew/dev-cmd/pr-automerge.rb
+++ b/Library/Homebrew/dev-cmd/pr-automerge.rb
@@ -26,10 +26,6 @@ module Homebrew
              description: "Pull requests do not require approval to be merged."
       switch "--publish",
              description: "Run `brew pr-publish` on matching pull requests."
-      switch "--autosquash",
-             description: "Instruct `brew pr-publish` to automatically reformat and reword commits "\
-                          "in the pull request to our preferred format.",
-             replacement: "`--no-autosquash` to opt out"
       switch "--no-autosquash",
              description: "Instruct `brew pr-publish` to skip automatically reformatting and rewording commits "\
                           "in the pull request to the preferred format."
diff --git a/Library/Homebrew/dev-cmd/pr-publish.rb b/Library/Homebrew/dev-cmd/pr-publish.rb
index 405a7f6778..f011fe1a58 100644
--- a/Library/Homebrew/dev-cmd/pr-publish.rb
+++ b/Library/Homebrew/dev-cmd/pr-publish.rb
@@ -16,10 +16,6 @@ module Homebrew
         Publish bottles for a pull request with GitHub Actions.
         Requires write access to the repository.
       EOS
-      switch "--autosquash",
-             description: "If supported on the target tap, automatically reformat and reword commits "\
-                          "in the pull request to our preferred format.",
-             replacement: "`--no-autosquash` to opt out"
       switch "--no-autosquash",
              description: "Skip automatically reformatting and rewording commits in the pull request "\
                           "to the preferred format, even if supported on the target tap."
diff --git a/Library/Homebrew/dev-cmd/pr-pull.rb b/Library/Homebrew/dev-cmd/pr-pull.rb
index c178221988..8cd5562c2f 100644
--- a/Library/Homebrew/dev-cmd/pr-pull.rb
+++ b/Library/Homebrew/dev-cmd/pr-pull.rb
@@ -32,10 +32,6 @@ module Homebrew
       switch "--keep-old",
              description: "If the formula specifies a rebuild version, " \
                           "attempt to preserve its value in the generated DSL."
-      switch "--autosquash",
-             description: "Automatically reformat and reword commits in the pull request to our "\
-                          "preferred format.",
-             replacement: "`--no-autosquash` to opt out"
       switch "--no-autosquash",
              description: "Skip automatically reformatting and rewording commits in the pull request to our "\
                           "preferred format."
diff --git a/Library/Homebrew/dev-cmd/pr-upload.rb b/Library/Homebrew/dev-cmd/pr-upload.rb
index 61020744a4..c74364e8fb 100644
--- a/Library/Homebrew/dev-cmd/pr-upload.rb
+++ b/Library/Homebrew/dev-cmd/pr-upload.rb
@@ -90,7 +90,7 @@ module Homebrew
   def pr_upload
     args = pr_upload_args.parse
 
-    # odeprecated "`brew pr-upload --github-org`", "`brew pr-upload` without `--github-org`" if args.github_org
+    odeprecated "`brew pr-upload --github-org`", "`brew pr-upload` without `--github-org`" if args.github_org
 
     json_files = Dir["*.bottle.json"]
     odie "No bottle JSON files found in the current working directory" if json_files.blank?
diff --git a/Library/Homebrew/formula_support.rb b/Library/Homebrew/formula_support.rb
index 127f45383b..8e317038dc 100644
--- a/Library/Homebrew/formula_support.rb
+++ b/Library/Homebrew/formula_support.rb
@@ -82,7 +82,7 @@ class BottleDisableReason
   def initialize(type, reason)
     @type = type
     @reason = reason
-    odeprecated "bottle :#{@type}" if valid?
+    odisabled "bottle :#{@type}" if valid?
   end
 
   def unneeded?