diff --git a/Cargo.lock b/Cargo.lock
index f3612507f81701..66a851dfe99a5b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6664,7 +6664,6 @@ dependencies = [
  "solana-logger",
  "solana-sdk",
  "solana-version",
- "static_assertions",
  "tokio",
  "url 2.5.2",
 ]
@@ -7678,7 +7677,6 @@ dependencies = [
 name = "solana-transaction-metrics-tracker"
 version = "2.1.0"
 dependencies = [
- "Inflector",
  "base64 0.22.1",
  "bincode",
  "lazy_static",
@@ -7916,9 +7914,7 @@ dependencies = [
  "bs58",
  "clap 3.2.23",
  "dirs-next",
- "num_cpus",
  "solana-clap-v3-utils",
- "solana-cli-config",
  "solana-remote-wallet",
  "solana-sdk",
  "solana-version",
diff --git a/accounts-cluster-bench/Cargo.toml b/accounts-cluster-bench/Cargo.toml
index 8ff7cc12b26276..f040315eccc994 100644
--- a/accounts-cluster-bench/Cargo.toml
+++ b/accounts-cluster-bench/Cargo.toml
@@ -17,7 +17,6 @@ solana-account-decoder = { workspace = true }
 solana-clap-utils = { workspace = true }
 solana-cli-config = { workspace = true }
 solana-client = { workspace = true }
-solana-faucet = { workspace = true }
 solana-gossip = { workspace = true }
 solana-inline-spl = { workspace = true }
 solana-logger = { workspace = true }
@@ -34,6 +33,7 @@ spl-token = { workspace = true, features = ["no-entrypoint"] }
 [dev-dependencies]
 solana-accounts-db = { workspace = true }
 solana-core = { workspace = true, features = ["dev-context-only-utils"] }
+solana-faucet = { workspace = true }
 solana-local-cluster = { workspace = true }
 solana-runtime = { workspace = true, features = ["dev-context-only-utils"] }
 solana-test-validator = { workspace = true }
diff --git a/bloom/Cargo.toml b/bloom/Cargo.toml
index 11e80be72aedc4..640dfbb644a173 100644
--- a/bloom/Cargo.toml
+++ b/bloom/Cargo.toml
@@ -14,7 +14,6 @@ bv = { workspace = true, features = ["serde"] }
 fnv = { workspace = true }
 log = { workspace = true }
 rand = { workspace = true }
-rayon = { workspace = true }
 serde = { workspace = true, features = ["rc"] }
 serde_derive = { workspace = true }
 solana-frozen-abi = { workspace = true, optional = true }
@@ -22,6 +21,9 @@ solana-frozen-abi-macro = { workspace = true, optional = true }
 solana-sanitize = { workspace = true }
 solana-sdk = { workspace = true }
 
+[dev-dependencies]
+rayon = { workspace = true }
+
 [lib]
 crate-type = ["lib"]
 name = "solana_bloom"
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 22a0172458adf1..707fccf53c20c9 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -36,7 +36,6 @@ solana-cli-output = { workspace = true }
 solana-client = { workspace = true }
 solana-compute-budget = { workspace = true }
 solana-config-program = { workspace = true }
-solana-faucet = { workspace = true }
 solana-loader-v4-program = { workspace = true }
 solana-logger = { workspace = true }
 solana-program-runtime = { workspace = true }
@@ -61,6 +60,7 @@ tiny-bip39 = { workspace = true }
 
 [dev-dependencies]
 assert_matches = { workspace = true }
+solana-faucet = { workspace = true }
 solana-rpc = { workspace = true }
 solana-streamer = { workspace = true }
 solana-test-validator = { workspace = true }
diff --git a/curves/curve25519/Cargo.toml b/curves/curve25519/Cargo.toml
index fb04c29b60171b..ce77b5ddca04db 100644
--- a/curves/curve25519/Cargo.toml
+++ b/curves/curve25519/Cargo.toml
@@ -12,8 +12,10 @@ edition = { workspace = true }
 [dependencies]
 bytemuck = { workspace = true }
 bytemuck_derive = { workspace = true }
-solana-program = { workspace = true }
 thiserror = { workspace = true }
 
+[target.'cfg(target_os = "solana")'.dependencies]
+solana-program = { workspace = true }
+
 [target.'cfg(not(target_os = "solana"))'.dependencies]
 curve25519-dalek = { workspace = true, features = ["serde"] }
diff --git a/net-utils/Cargo.toml b/net-utils/Cargo.toml
index 1ba1f95ee4b46f..6bd0a9e9bd70eb 100644
--- a/net-utils/Cargo.toml
+++ b/net-utils/Cargo.toml
@@ -22,7 +22,6 @@ socket2 = { workspace = true }
 solana-logger = { workspace = true }
 solana-sdk = { workspace = true }
 solana-version = { workspace = true }
-static_assertions = { workspace = true }
 tokio = { workspace = true, features = ["full"] }
 url = { workspace = true }
 
diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock
index 888b63d7d20d03..a96a8c04b65763 100644
--- a/programs/sbf/Cargo.lock
+++ b/programs/sbf/Cargo.lock
@@ -4628,7 +4628,6 @@ dependencies = [
  "fnv",
  "log",
  "rand 0.8.5",
- "rayon",
  "rustc_version",
  "serde",
  "serde_derive",
@@ -5207,7 +5206,6 @@ dependencies = [
  "solana-logger",
  "solana-sdk",
  "solana-version",
- "static_assertions",
  "tokio",
  "url 2.5.2",
 ]
@@ -6383,7 +6381,6 @@ dependencies = [
 name = "solana-transaction-metrics-tracker"
 version = "2.1.0"
 dependencies = [
- "Inflector",
  "base64 0.22.1",
  "bincode",
  "lazy_static",
@@ -6561,7 +6558,6 @@ dependencies = [
  "solana-entry",
  "solana-gossip",
  "solana-ledger",
- "solana-logger",
  "solana-program",
  "solana-program-runtime",
  "solana-runtime",
diff --git a/transaction-dos/Cargo.toml b/transaction-dos/Cargo.toml
index 1a112b2ff34e4a..ccf7b7094391e9 100644
--- a/transaction-dos/Cargo.toml
+++ b/transaction-dos/Cargo.toml
@@ -17,7 +17,6 @@ rayon = { workspace = true }
 solana-clap-utils = { workspace = true }
 solana-cli = { workspace = true }
 solana-client = { workspace = true }
-solana-core = { workspace = true }
 solana-faucet = { workspace = true }
 solana-gossip = { workspace = true }
 solana-logger = { workspace = true }
diff --git a/transaction-metrics-tracker/Cargo.toml b/transaction-metrics-tracker/Cargo.toml
index c4882603174422..92c0ec31c32b44 100644
--- a/transaction-metrics-tracker/Cargo.toml
+++ b/transaction-metrics-tracker/Cargo.toml
@@ -10,7 +10,6 @@ license = { workspace = true }
 edition = { workspace = true }
 
 [dependencies]
-Inflector = { workspace = true }
 base64 = { workspace = true }
 bincode = { workspace = true }
 # Update this borsh dependency to the workspace version once
diff --git a/wen-restart/Cargo.toml b/wen-restart/Cargo.toml
index 57f3451263cabd..7cf9711aefd72c 100644
--- a/wen-restart/Cargo.toml
+++ b/wen-restart/Cargo.toml
@@ -19,7 +19,6 @@ rayon = { workspace = true }
 solana-entry = { workspace = true }
 solana-gossip = { workspace = true }
 solana-ledger = { workspace = true }
-solana-logger = { workspace = true }
 solana-program = { workspace = true }
 solana-program-runtime = { workspace = true }
 solana-runtime = { workspace = true }
@@ -32,6 +31,7 @@ rand = { workspace = true }
 serial_test = { workspace = true }
 solana-accounts-db = { workspace = true }
 solana-entry = { workspace = true }
+solana-logger = { workspace = true }
 solana-runtime = { workspace = true, features = ["dev-context-only-utils"] }
 solana-streamer = { workspace = true }
 tempfile = { workspace = true }
diff --git a/zk-keygen/Cargo.toml b/zk-keygen/Cargo.toml
index 0a1602045e6b01..cdda986d0c0153 100644
--- a/zk-keygen/Cargo.toml
+++ b/zk-keygen/Cargo.toml
@@ -19,9 +19,7 @@ edition = { workspace = true }
 bs58 = { workspace = true }
 clap = { version = "3.1.5", features = ["cargo", "derive"] }
 dirs-next = { workspace = true }
-num_cpus = { workspace = true }
 solana-clap-v3-utils = { workspace = true }
-solana-cli-config = { workspace = true }
 solana-remote-wallet = { workspace = true, features = ["default"] }
 solana-sdk = { workspace = true }
 solana-version = { workspace = true }