diff --git a/Cargo.lock b/Cargo.lock
index 1cacda506129..19ccc01576a4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1050,27 +1050,6 @@ dependencies = [
  "tracing",
 ]
 
-[[package]]
-name = "axum-extra"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "460fc6f625a1f7705c6cf62d0d070794e94668988b1c38111baeec177c715f7b"
-dependencies = [
- "axum",
- "axum-core",
- "bytes",
- "futures-util",
- "http 1.2.0",
- "http-body 1.0.1",
- "http-body-util",
- "mime",
- "pin-project-lite",
- "serde",
- "tower 0.5.2",
- "tower-layer",
- "tower-service",
-]
-
 [[package]]
 name = "axum-macros"
 version = "0.5.0"
@@ -1171,29 +1150,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "bindgen"
-version = "0.69.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088"
-dependencies = [
- "bitflags 2.9.0",
- "cexpr",
- "clang-sys",
- "itertools 0.12.1",
- "lazy_static",
- "lazycell",
- "log",
- "prettyplease",
- "proc-macro2",
- "quote",
- "regex",
- "rustc-hash 1.1.0",
- "shlex",
- "syn 2.0.99",
- "which 4.4.2",
-]
-
 [[package]]
 name = "bit-set"
 version = "0.5.3"
@@ -1479,15 +1435,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"
 
-[[package]]
-name = "cexpr"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
-dependencies = [
- "nom",
-]
-
 [[package]]
 name = "cfb"
 version = "0.10.0"
@@ -1595,17 +1542,6 @@ dependencies = [
  "inout",
 ]
 
-[[package]]
-name = "clang-sys"
-version = "1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
-dependencies = [
- "glob",
- "libc",
- "libloading",
-]
-
 [[package]]
 name = "clap"
 version = "4.5.31"
@@ -2531,16 +2467,7 @@ version = "5.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
 dependencies = [
- "dirs-sys 0.4.1",
-]
-
-[[package]]
-name = "dirs"
-version = "6.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e"
-dependencies = [
- "dirs-sys 0.5.0",
+ "dirs-sys",
 ]
 
 [[package]]
@@ -2551,22 +2478,10 @@ checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
 dependencies = [
  "libc",
  "option-ext",
- "redox_users 0.4.6",
+ "redox_users",
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "dirs-sys"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab"
-dependencies = [
- "libc",
- "option-ext",
- "redox_users 0.5.0",
- "windows-sys 0.59.0",
-]
-
 [[package]]
 name = "displaydoc"
 version = "0.2.5"
@@ -3303,7 +3218,7 @@ dependencies = [
  "criterion",
  "ctor",
  "dashmap 6.1.0",
- "dirs 5.0.1",
+ "dirs",
  "dotenvy",
  "etcetera",
  "fs2",
@@ -3361,7 +3276,6 @@ dependencies = [
  "dotenvy",
  "goose",
  "include_dir",
- "mcp-core",
  "once_cell",
  "paste",
  "regex",
@@ -3369,7 +3283,6 @@ dependencies = [
  "serde",
  "serde_json",
  "tokio",
- "toml",
  "tracing",
  "tracing-subscriber",
  "winapi",
@@ -3384,12 +3297,10 @@ dependencies = [
  "axum",
  "base64 0.22.1",
  "bat",
- "bytes",
  "chrono",
  "clap",
  "cliclack",
  "console",
- "dirs 5.0.1",
  "dotenvy",
  "etcetera",
  "futures",
@@ -3402,12 +3313,10 @@ dependencies = [
  "mcp-client",
  "mcp-core",
  "mcp-server",
- "minijinja",
  "nix 0.30.1",
  "once_cell",
  "rand 0.8.5",
  "regex",
- "reqwest 0.12.12",
  "rmcp",
  "rustyline",
  "serde",
@@ -3419,7 +3328,6 @@ dependencies = [
  "tempfile",
  "test-case",
  "tokio",
- "tokio-stream",
  "tokio-util",
  "tower-http",
  "tracing",
@@ -3451,7 +3359,6 @@ dependencies = [
  "include_dir",
  "indoc",
  "keyring",
- "kill_tree",
  "lazy_static",
  "lopdf",
  "mcp-core",
@@ -3477,7 +3384,7 @@ dependencies = [
  "url",
  "utoipa",
  "webbrowser 0.8.15",
- "which 6.0.3",
+ "which",
  "xcap",
 ]
 
@@ -3488,13 +3395,11 @@ dependencies = [
  "anyhow",
  "async-trait",
  "axum",
- "axum-extra",
  "base64 0.21.7",
  "bytes",
  "chrono",
  "clap",
  "config",
- "dirs 6.0.0",
  "etcetera",
  "futures",
  "goose",
@@ -3502,7 +3407,6 @@ dependencies = [
  "http 1.2.0",
  "mcp-core",
  "mcp-server",
- "once_cell",
  "reqwest 0.12.12",
  "rmcp",
  "serde",
@@ -3510,7 +3414,6 @@ dependencies = [
  "serde_yaml",
  "thiserror 1.0.69",
  "tokio",
- "tokio-cron-scheduler",
  "tokio-stream",
  "tokio-util",
  "tower 0.5.2",
@@ -4408,18 +4311,6 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
-[[package]]
-name = "kill_tree"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3879339076ac4da142cc852d91693462927cbc99773b5ea422e4834e68c4ff2"
-dependencies = [
- "bindgen",
- "nix 0.27.1",
- "tracing",
- "windows 0.52.0",
-]
-
 [[package]]
 name = "lance"
 version = "0.19.2"
@@ -4860,12 +4751,6 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
-[[package]]
-name = "lazycell"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
-
 [[package]]
 name = "lebe"
 version = "0.5.2"
@@ -4980,16 +4865,6 @@ dependencies = [
  "pkg-config",
 ]
 
-[[package]]
-name = "libloading"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
-dependencies = [
- "cfg-if",
- "windows-targets 0.52.6",
-]
-
 [[package]]
 name = "libm"
 version = "0.2.15"
@@ -5179,7 +5054,6 @@ dependencies = [
  "async-trait",
  "axum",
  "base64 0.22.1",
- "chrono",
  "eventsource-client",
  "futures",
  "mcp-core",
@@ -5197,7 +5071,6 @@ dependencies = [
  "tokio",
  "tokio-util",
  "tower 0.4.13",
- "tower-service",
  "tracing",
  "tracing-subscriber",
  "url",
@@ -5208,17 +5081,11 @@ dependencies = [
 name = "mcp-core"
 version = "0.1.0"
 dependencies = [
- "anyhow",
- "async-trait",
- "base64 0.21.7",
- "chrono",
  "rmcp",
- "schemars",
  "serde",
  "serde_json",
  "tempfile",
  "thiserror 1.0.69",
- "url",
  "utoipa",
 ]
 
@@ -5227,12 +5094,10 @@ name = "mcp-server"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "async-trait",
  "futures",
  "mcp-core",
  "pin-project",
  "rmcp",
- "schemars",
  "serde",
  "serde_json",
  "thiserror 1.0.69",
@@ -5465,17 +5330,6 @@ dependencies = [
  "smallvec",
 ]
 
-[[package]]
-name = "nix"
-version = "0.27.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
-dependencies = [
- "bitflags 2.9.0",
- "cfg-if",
- "libc",
-]
-
 [[package]]
 name = "nix"
 version = "0.29.0"
@@ -6702,17 +6556,6 @@ dependencies = [
  "thiserror 1.0.69",
 ]
 
-[[package]]
-name = "redox_users"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd6f9d3d47bdd2ad6945c5015a226ec6155d0bcdfd8f7cd29f86b71f8de99d2b"
-dependencies = [
- "getrandom 0.2.15",
- "libredox",
- "thiserror 2.0.12",
-]
-
 [[package]]
 name = "ref-cast"
 version = "1.0.24"
@@ -7528,7 +7371,7 @@ version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "da03fa3b94cc19e3ebfc88c4229c49d8f08cdbd1228870a45f0ffdf84988e14b"
 dependencies = [
- "dirs 5.0.1",
+ "dirs",
 ]
 
 [[package]]
@@ -9069,18 +8912,6 @@ version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
 
-[[package]]
-name = "which"
-version = "4.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7"
-dependencies = [
- "either",
- "home",
- "once_cell",
- "rustix 0.38.44",
-]
-
 [[package]]
 name = "which"
 version = "6.0.3"
@@ -9133,16 +8964,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
-[[package]]
-name = "windows"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
-dependencies = [
- "windows-core 0.52.0",
- "windows-targets 0.52.6",
-]
-
 [[package]]
 name = "windows"
 version = "0.57.0"
diff --git a/crates/goose-bench/Cargo.toml b/crates/goose-bench/Cargo.toml
index 05bd50fb12e6..d91d09df32da 100644
--- a/crates/goose-bench/Cargo.toml
+++ b/crates/goose-bench/Cargo.toml
@@ -15,7 +15,6 @@ anyhow = "1.0"
 paste = "1.0"
 ctor = "0.2.7"
 goose = { path = "../goose" }
-mcp-core = { path = "../mcp-core" }
 rmcp = { workspace = true }
 async-trait = "0.1.86"
 chrono = { version = "0.4", features = ["serde"] }
@@ -27,7 +26,6 @@ tokio = { version = "1.43", features = ["full"] }
 include_dir = "0.7.4"
 once_cell = "1.19"
 regex = "1.11.1"
-toml = "0.8.20"
 dotenvy = "0.15.7"
 
 [target.'cfg(target_os = "windows")'.dependencies]
diff --git a/crates/goose-cli/Cargo.toml b/crates/goose-cli/Cargo.toml
index 050c15c1585e..bb50020858c0 100644
--- a/crates/goose-cli/Cargo.toml
+++ b/crates/goose-cli/Cargo.toml
@@ -36,18 +36,6 @@ serde = { version = "1.0", features = ["derive"] }  # For serialization
 serde_yaml = "0.9"
 tempfile = "3"
 etcetera = "0.8.0"
-reqwest = { version = "0.12.9", features = [
-    "rustls-tls-native-roots",
-    "json",
-    "cookies",
-    "gzip",
-    "brotli",
-    "deflate",
-    "zstd",
-    "charset",
-    "http2",
-    "stream"
-], default-features = false }
 rand = "0.8.5"
 rustyline = "15.0.0"
 tracing = "0.1"
@@ -59,15 +47,11 @@ shlex = "1.3.0"
 async-trait = "0.1.86"
 base64 = "0.22.1"
 regex = "1.11.1"
-minijinja = { version = "2.10.2", features = ["loader"] }
 nix = { version = "0.30.1", features = ["process", "signal"] }
 tar = "0.4"
-dirs = "5.0"
 # Web server dependencies
 axum = { version = "0.8.1", features = ["ws", "macros"] }
 tower-http = { version = "0.5", features = ["cors", "fs"] }
-tokio-stream = "0.1"
-bytes = "1.5"
 http = "1.0"
 webbrowser = "1.0"
 indicatif = "0.17.11"
diff --git a/crates/goose-mcp/Cargo.toml b/crates/goose-mcp/Cargo.toml
index 71d6088d2c32..6bcf1e716f12 100644
--- a/crates/goose-mcp/Cargo.toml
+++ b/crates/goose-mcp/Cargo.toml
@@ -25,7 +25,6 @@ thiserror = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 lazy_static = "1.5"
-kill_tree = "0.2.4"
 shellexpand = "3.1.0"
 indoc = "2.0.5"
 xcap = "0.0.14"
diff --git a/crates/goose-server/Cargo.toml b/crates/goose-server/Cargo.toml
index 8260a9290a66..483746c0b751 100644
--- a/crates/goose-server/Cargo.toml
+++ b/crates/goose-server/Cargo.toml
@@ -19,7 +19,6 @@ rmcp = { workspace = true }
 axum = { version = "0.8.1", features = ["ws", "macros"] }
 tokio = { version = "1.43", features = ["full"] }
 chrono = "0.4"
-tokio-cron-scheduler = "0.14.0"
 tower-http = { version = "0.5", features = ["cors"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
@@ -35,12 +34,9 @@ base64 = "0.21"
 config = { version = "0.14.1", features = ["toml"] }
 thiserror = "1.0"
 clap = { version = "4.4", features = ["derive"] }
-once_cell = "1.20.2"
 etcetera = "0.8.0"
 serde_yaml = "0.9.34"
-axum-extra = "0.10.0"
 utoipa = { version = "4.1", features = ["axum_extras", "chrono"] }
-dirs = "6.0.0"
 reqwest = { version = "0.12.9", features = ["json", "rustls-tls", "blocking", "multipart"], default-features = false }
 tokio-util = "0.7.15"
 
diff --git a/crates/mcp-client/Cargo.toml b/crates/mcp-client/Cargo.toml
index cc05182a2285..94cf802fd629 100644
--- a/crates/mcp-client/Cargo.toml
+++ b/crates/mcp-client/Cargo.toml
@@ -23,14 +23,12 @@ anyhow = "1.0"
 tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 tower = { version = "0.4", features = ["timeout", "util"] }
-tower-service = "0.3"
 rand = "0.8"
 nix = { version = "0.30.1", features = ["process", "signal"] }
 # OAuth dependencies
 axum = { version = "0.8", features = ["query"] }
 base64 = "0.22"
 sha2 = "0.10"
-chrono = { version = "0.4", features = ["serde"] }
 nanoid = "0.4"
 webbrowser = "1.0"
 serde_urlencoded = "0.7"
diff --git a/crates/mcp-core/Cargo.toml b/crates/mcp-core/Cargo.toml
index 893e63f5337b..0badee6af927 100644
--- a/crates/mcp-core/Cargo.toml
+++ b/crates/mcp-core/Cargo.toml
@@ -7,16 +7,10 @@ edition = "2021"
 workspace = true
 
 [dependencies]
-async-trait = "0.1"
 rmcp = { workspace = true }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 thiserror = "1.0"
-schemars = "0.8"
-anyhow = "1.0"
-chrono = { version = "0.4.38", features = ["serde"] }
-url = "2.5"
-base64 = "0.21"
 utoipa = "4.1"
 
 [dev-dependencies]
diff --git a/crates/mcp-server/Cargo.toml b/crates/mcp-server/Cargo.toml
index 7058b5377fd5..38298372744f 100644
--- a/crates/mcp-server/Cargo.toml
+++ b/crates/mcp-server/Cargo.toml
@@ -13,7 +13,6 @@ mcp-core = { path = "../mcp-core" }
 rmcp = { workspace = true }
 serde = { version = "1.0.216", features = ["derive"] }
 serde_json = "1.0.133"
-schemars = "0.8"
 tokio = { version = "1", features = ["full"] }
 tower = { version = "0.4", features = ["timeout"] }
 tower-service = "0.3"
@@ -22,4 +21,3 @@ pin-project = "1.1"
 tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 tracing-appender = "0.2"
-async-trait = "0.1"