diff --git a/.zed/tasks.json b/.zed/tasks.json
index c95cf5ffb185cc0380fd4b1c9d5ed45bf2ba474f..80465969e2b3b1d9425630cdb8da1f926b8447ff 100644
--- a/.zed/tasks.json
+++ b/.zed/tasks.json
@@ -3,10 +3,5 @@
     "label": "clippy",
     "command": "cargo",
     "args": ["xtask", "clippy"]
-  },
-  {
-    "label": "assistant2",
-    "command": "cargo",
-    "args": ["run", "-p", "assistant2", "--example", "assistant_example"]
   }
 ]
diff --git a/Cargo.lock b/Cargo.lock
index 404a428598ba16ff1e48e84b45f6e79fc0c2d840..71675fbee8eef28c5ec50bc481f9d75269976c29 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9734,7 +9734,6 @@ name = "storybook"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "assistant2",
  "clap 4.4.4",
  "collab_ui",
  "ctrlc",
@@ -12994,7 +12993,6 @@ dependencies = [
  "anyhow",
  "assets",
  "assistant",
- "assistant2",
  "audio",
  "auto_update",
  "backtrace",
diff --git a/assets/keymaps/default-macos.json b/assets/keymaps/default-macos.json
index 0d03767d8f5a21196b73803202824ac8bdc64116..d99f78ffa68095d66bb1af1ba826e1949317f3ae 100644
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -207,14 +207,6 @@
       "ctrl-shift-enter": "editor::NewlineBelow"
     }
   },
-  {
-    "context": "AssistantChat > Editor", // Used in the assistant2 crate
-    "bindings": {
-      "enter": ["assistant2::Submit", "Simple"],
-      "cmd-enter": ["assistant2::Submit", "Codebase"],
-      "escape": "assistant2::Cancel"
-    }
-  },
   {
     "context": "AssistantPanel", // Used in the assistant crate, which we're replacing
     "bindings": {
diff --git a/crates/storybook/Cargo.toml b/crates/storybook/Cargo.toml
index 0d084ae847689211e3bd03c04dfd784d605e87ee..1d7a828dd74e5078383c97554293348ae9288302 100644
--- a/crates/storybook/Cargo.toml
+++ b/crates/storybook/Cargo.toml
@@ -14,7 +14,6 @@ path = "src/storybook.rs"
 
 [dependencies]
 anyhow.workspace = true
-assistant2 = { workspace = true, features = ["stories"] }
 clap = { workspace = true, features = ["derive", "string"] }
 collab_ui = { workspace = true, features = ["stories"] }
 ctrlc = "3.4"
diff --git a/crates/storybook/src/story_selector.rs b/crates/storybook/src/story_selector.rs
index 9d2c03084779e36b180b76da28b1b0dc98ffc669..c7013a11f8f999f4b2f2f066742683c5e687c443 100644
--- a/crates/storybook/src/story_selector.rs
+++ b/crates/storybook/src/story_selector.rs
@@ -12,8 +12,6 @@ use ui::prelude::*;
 #[derive(Debug, PartialEq, Eq, Clone, Copy, strum::Display, EnumString, EnumIter)]
 #[strum(serialize_all = "snake_case")]
 pub enum ComponentStory {
-    AssistantChatMessage,
-    AssistantChatNotice,
     AutoHeightEditor,
     Avatar,
     Button,
@@ -46,10 +44,6 @@ pub enum ComponentStory {
 impl ComponentStory {
     pub fn story(&self, cx: &mut WindowContext) -> AnyView {
         match self {
-            Self::AssistantChatMessage => {
-                cx.new_view(|_cx| assistant2::ui::ChatMessageStory).into()
-            }
-            Self::AssistantChatNotice => cx.new_view(|_cx| assistant2::ui::ChatNoticeStory).into(),
             Self::AutoHeightEditor => AutoHeightEditorStory::new(cx).into(),
             Self::Avatar => cx.new_view(|_| ui::AvatarStory).into(),
             Self::Button => cx.new_view(|_| ui::ButtonStory).into(),
diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml
index da908082c0e79f3f691e9708cd542a57dd38cc28..9384286eaf9b39712ead7333ef77f0457cff38a2 100644
--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@@ -19,7 +19,6 @@ activity_indicator.workspace = true
 anyhow.workspace = true
 assets.workspace = true
 assistant.workspace = true
-assistant2.workspace = true
 audio.workspace = true
 auto_update.workspace = true
 backtrace = "0.3"
diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs
index 7444b9d82111a97c77a07fc19439ad16c240db83..957f753da31c889ba68abb94601f5dc895c70492 100644
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@@ -175,7 +175,6 @@ fn init_ui(app_state: Arc<AppState>, cx: &mut AppContext) -> Result<()> {
     inline_completion_registry::init(app_state.client.telemetry().clone(), cx);
 
     assistant::init(app_state.client.clone(), cx);
-    assistant2::init(app_state.client.clone(), cx);
 
     cx.observe_global::<SettingsStore>({
         let languages = app_state.languages.clone();
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index 5124ef0074dccdfb2d7359c30a3a3ae872bfe0f9..4bf4679297b10791c2599891f0a4df23d428ae93 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -225,30 +225,6 @@ pub fn initialize_workspace(app_state: Arc<AppState>, cx: &mut AppContext) {
         })
         .detach();
 
-        let mut current_user = app_state.user_store.read(cx).watch_current_user();
-
-        cx.spawn(|workspace_handle, mut cx| async move {
-            while let Some(user) = current_user.next().await {
-                if user.is_some() {
-                    // User known now, can check feature flags / staff
-                    // At this point, should have the user with staff status available
-                    let use_assistant2 = cx.update(|cx| assistant2::enabled(cx))?;
-                    if use_assistant2 {
-                        let panel =
-                            assistant2::AssistantPanel::load(workspace_handle.clone(), cx.clone())
-                                .await?;
-                        workspace_handle.update(&mut cx, |workspace, cx| {
-                            workspace.add_panel(panel, cx);
-                        })?;
-                    }
-
-                    break;
-                }
-            }
-            anyhow::Ok(())
-        })
-        .detach();
-
         workspace
             .register_action(about)
             .register_action(|_, _: &Minimize, cx| {