diff --git a/build/main.rs b/build/main.rs
index 964e5ed..dd185c9 100644
--- a/build/main.rs
+++ b/build/main.rs
@@ -37,8 +37,5 @@ fn mangen(out_dir: &Path) -> DynResult {
 
     clap_mangen::generate_to(Cmd::command().name("handlr"), &dest_dir)?;
 
-    // Remove hidden subcommand's manpage
-    remove_file(dest_dir.join("handlr-autocomplete.1"))?;
-
     Ok(())
 }
diff --git a/src/cli.rs b/src/cli.rs
index 5790496..1e1a27b 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -219,22 +219,6 @@ pub enum Cmd {
         /// Output mimetype info as json
         json: bool,
     },
-
-    #[clap(hide = true)]
-    /// Helper subcommand for autocompletion scripts; should be hidden
-    ///
-    /// This should not be visible in `handlr --help` output, autocompletion, or man pages.
-    /// If you see this there, please open an issue on GitHub.
-    ///
-    /// However it is fine if this shows up in the output of `handlr autocomplete --help`.
-    Autocomplete {
-        #[clap(short)]
-        /// Autocomplete for desktop files present on system
-        desktop_files: bool,
-        #[clap(short)]
-        /// Autocomplete for mimetypes/file extensions
-        mimes: bool,
-    },
 }
 
 #[derive(Clone, Args)]
diff --git a/src/main.rs b/src/main.rs
index 49945d7..52c488b 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -52,17 +52,6 @@ fn main() -> Result<()> {
         Cmd::List { all, json } => config.print(&mut stdout, all, json),
         Cmd::Unset { mime } => config.unset_handler(&mime),
         Cmd::Remove { mime, handler } => config.remove_handler(&mime, &handler),
-        Cmd::Autocomplete {
-            desktop_files: _,
-            mimes: _,
-        } => {
-            // if desktop_files {
-            //     SystemApps::list_handlers(&mut stdout)?;
-            // } else if mimes {
-            //     common::db_autocomplete(&mut stdout)?;
-            // }
-            Ok(())
-        }
     };
 
     // Issue a notification if handlr is not being run in a terminal