diff --git a/crates/atuin/src/command/client.rs b/crates/atuin/src/command/client.rs
index 741780c4..31b96583 100644
--- a/crates/atuin/src/command/client.rs
+++ b/crates/atuin/src/command/client.rs
@@ -29,16 +29,12 @@ mod init;
 mod kv;
 mod scripts;
 mod search;
-mod setup;
 mod stats;
 mod store;
 
 #[derive(Subcommand, Debug)]
 #[command(infer_subcommands = true)]
 pub enum Cmd {
-    /// Setup Atuin features
-    #[command()]
-    Setup,
 
     /// Manipulate shell history
     #[command(subcommand)]
@@ -178,7 +174,6 @@ impl Cmd {
         let theme = theme_manager.load_theme(theme_name.as_str(), settings.theme.max_depth);
 
         match self {
-            Self::Setup => setup::run(&settings).await,
             Self::Import(import) => import.run(&db).await,
             Self::Stats(stats) => stats.run(&db, &settings, theme).await,
             Self::Search(search) => search.run(db, &mut settings, sqlite_store, theme).await,
diff --git a/crates/atuin/src/command/client/setup.rs b/crates/atuin/src/command/client/setup.rs
deleted file mode 100644
index 8de73d62..00000000
--- a/crates/atuin/src/command/client/setup.rs
+++ /dev/null
@@ -1,81 +0,0 @@
-use atuin_client::settings::Settings;
-
-use colored::Colorize;
-use eyre::Result;
-use std::io::{self, Write};
-use toml_edit::{DocumentMut, value};
-
-pub async fn run(_settings: &Settings) -> Result<()> {
-    let enable_ai = prompt(
-        "Atuin AI",
-        "This will enable command generation and other AI features via the question mark key",
-        Some(
-            "By default, Atuin AI only has access to the name and version of your operating system and shell - your shell history is not sent to the AI.",
-        ),
-    )?;
-
-    let enable_daemon = prompt(
-        "Atuin Daemon",
-        "This will enable improved search and history sync using a persistent background process",
-        None,
-    )?;
-
-    let config_file = Settings::get_config_path()?;
-    let config_str = tokio::fs::read_to_string(&config_file).await?;
-    let mut doc = config_str.parse::<DocumentMut>()?;
-
-    let mut changed = false;
-    if enable_ai {
-        changed = true;
-        if !doc.contains_key("ai") {
-            doc["ai"] = toml_edit::table();
-        }
-        doc["ai"]["enabled"] = value(true);
-    }
-
-    if enable_daemon {
-        changed = true;
-        if !doc.contains_key("daemon") {
-            doc["daemon"] = toml_edit::table();
-        }
-        doc["daemon"]["enabled"] = value(true);
-        doc["daemon"]["autostart"] = value(true);
-        doc["search_mode"] = value("daemon-fuzzy");
-    }
-
-    if changed {
-        tokio::fs::write(config_file, doc.to_string()).await?;
-
-        println!(
-            "{check} Settings updated successfully",
-            check = "✓".bold().bright_green()
-        );
-    } else {
-        println!(
-            "{check} No settings changed",
-            check = "✓".bold().bright_green()
-        );
-    }
-
-    Ok(())
-}
-
-pub fn prompt(feature: &str, description: &str, note: Option<&str>) -> Result<bool> {
-    println!(
-        "> Enable {feature}?",
-        feature = feature.bold().bright_blue()
-    );
-    if let Some(note) = note {
-        println!("  {description}");
-        print!("  {note} {q} ", q = "[Y/n]".bold());
-    } else {
-        print!("  {description} {q} ", q = "[Y/n]".bold());
-    }
-
-    io::stdout().flush().ok();
-
-    let mut input = String::new();
-    io::stdin().read_line(&mut input)?;
-    let answer = input.trim().to_lowercase();
-    Ok(answer.is_empty() || answer == "y" || answer == "yes")
-}