diff --git a/Cargo.lock b/Cargo.lock
index fe5d6dc0..481147ed 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -262,55 +262,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "anstream"
-version = "0.6.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
-dependencies = [
- "anstyle",
- "anstyle-parse",
- "anstyle-query",
- "anstyle-wincon",
- "colorchoice",
- "is_terminal_polyfill",
- "utf8parse",
-]
-
-[[package]]
-name = "anstyle"
-version = "1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
-
-[[package]]
-name = "anstyle-parse"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
-dependencies = [
- "utf8parse",
-]
-
-[[package]]
-name = "anstyle-query"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
-dependencies = [
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "anstyle-wincon"
-version = "3.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
-dependencies = [
- "anstyle",
- "windows-sys 0.52.0",
-]
-
 [[package]]
 name = "anyhow"
 version = "1.0.87"
@@ -351,6 +302,15 @@ version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
+[[package]]
+name = "autotools"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef941527c41b0fc0dd48511a8154cd5fc7e29200a0ff8b7203c5d777dbc795cf"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "axum"
 version = "0.6.20"
@@ -565,52 +525,12 @@ dependencies = [
  "ansi_term",
  "atty",
  "bitflags 1.3.2",
- "strsim 0.8.0",
+ "strsim",
  "textwrap",
  "unicode-width",
  "vec_map",
 ]
 
-[[package]]
-name = "clap"
-version = "4.5.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0956a43b323ac1afaffc053ed5c4b7c1f1800bacd1683c353aabbb752515dd3"
-dependencies = [
- "clap_builder",
- "clap_derive",
-]
-
-[[package]]
-name = "clap_builder"
-version = "4.5.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d72166dd41634086d5803a47eb71ae740e61d84709c36f3c34110173db3961b"
-dependencies = [
- "anstream",
- "anstyle",
- "clap_lex",
- "strsim 0.11.1",
-]
-
-[[package]]
-name = "clap_derive"
-version = "4.5.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
-dependencies = [
- "heck 0.5.0",
- "proc-macro2",
- "quote",
- "syn 2.0.77",
-]
-
-[[package]]
-name = "clap_lex"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
-
 [[package]]
 name = "color-backtrace"
 version = "0.6.1"
@@ -621,12 +541,6 @@ dependencies = [
  "termcolor",
 ]
 
-[[package]]
-name = "colorchoice"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
-
 [[package]]
 name = "const_format"
 version = "0.2.33"
@@ -1063,12 +977,6 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
-[[package]]
-name = "heck"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
-
 [[package]]
 name = "heed"
 version = "0.20.5"
@@ -1277,12 +1185,6 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "is_terminal_polyfill"
-version = "1.70.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
-
 [[package]]
 name = "itertools"
 version = "0.10.5"
@@ -1310,8 +1212,6 @@ dependencies = [
 [[package]]
 name = "jopemachine-raft"
 version = "0.7.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57206b3af8ccd4a755cac94abb0f0692544dfb10869f64dbc19b69ab73c6e251"
 dependencies = [
  "bytes",
  "fxhash",
@@ -1830,17 +1730,28 @@ checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94"
 
 [[package]]
 name = "protobuf-build"
-version = "0.14.1"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2df9942df2981178a930a72d442de47e2f0df18ad68e50a30f816f1848215ad0"
+checksum = "c852d9625b912c3e50480cdc701f60f49890b5d7ad46198dd583600f15e7c6ec"
 dependencies = [
  "bitflags 1.3.2",
  "proc-macro2",
  "prost-build",
+ "protobuf-src",
  "quote",
+ "regex",
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "protobuf-src"
+version = "1.1.0+21.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7ac8852baeb3cc6fb83b93646fb93c0ffe5d14bf138c945ceb4b9948ee0e3c1"
+dependencies = [
+ "autotools",
+]
+
 [[package]]
 name = "quote"
 version = "1.0.37"
@@ -1853,8 +1764,6 @@ dependencies = [
 [[package]]
 name = "raft-proto"
 version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb6884896294f553e8d5cfbdb55080b9f5f2f43394afff59c9f077e0f4b46d6b"
 dependencies = [
  "lazy_static",
  "prost",
@@ -1871,7 +1780,6 @@ dependencies = [
  "built",
  "bytes",
  "chrono",
- "clap 4.5.18",
  "heed",
  "heed-traits",
  "jopemachine-raft",
@@ -2213,19 +2121,13 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
 
-[[package]]
-name = "strsim"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
-
 [[package]]
 name = "structopt"
 version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10"
 dependencies = [
- "clap 2.34.0",
+ "clap",
  "lazy_static",
  "structopt-derive",
 ]
@@ -2677,12 +2579,6 @@ dependencies = [
  "percent-encoding",
 ]
 
-[[package]]
-name = "utf8parse"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
-
 [[package]]
 name = "vec_map"
 version = "0.8.2"
@@ -2956,7 +2852,3 @@ dependencies = [
  "cc",
  "pkg-config",
 ]
-
-[[patch.unused]]
-name = "jopemachine-raft"
-version = "0.7.9"
diff --git a/raft-rs b/raft-rs
index 48bb3f82..d1c8c891 160000
--- a/raft-rs
+++ b/raft-rs
@@ -1 +1 @@
-Subproject commit 48bb3f82cbc52c46464bf3ff3702df7d41243946
+Subproject commit d1c8c891032be1f5b17f144c1f8d60eaf9be6477
diff --git a/raftify-cli/Cargo.lock b/raftify-cli/Cargo.lock
index 3575ba14..4402bdca 100644
--- a/raftify-cli/Cargo.lock
+++ b/raftify-cli/Cargo.lock
@@ -1239,26 +1239,13 @@ dependencies = [
 name = "raftify_cli"
 version = "0.1.0"
 dependencies = [
- "async-trait",
- "bincode",
  "built",
- "bytes",
- "chrono",
  "clap",
- "heed",
- "heed-traits",
- "jopemachine-raft",
  "log",
- "parking_lot",
- "prost",
  "raftify",
  "serde",
  "serde_json",
  "slog",
- "slog-stdlog",
- "thiserror",
- "tokio",
- "tonic",
  "tonic-build",
 ]
 
diff --git a/raftify-cli/Cargo.toml b/raftify-cli/Cargo.toml
index c75a6e9b..0c3394d4 100644
--- a/raftify-cli/Cargo.toml
+++ b/raftify-cli/Cargo.toml
@@ -2,27 +2,16 @@
 name = "raftify_cli"
 version = "0.1.0"
 edition = "2021"
+description = "Raftify CLI tool"
+license = "MIT/Apache-2.0"
 
 [dependencies]
-async-trait = "0.1.82"
-bincode = "1.3"
-bytes = "1.7.2"
-heed = "0.20.5"
-heed-traits = "0.20"
 log = { version = "0.4", features = ["std"] }
-parking_lot = "0.12.3"
-prost = "0.11"
-raft = { version = "0.7.9", features = ["prost-codec", "default-logger"], default-features = false, package = "jopemachine-raft" }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 slog = "2"
-slog-stdlog = "4"
-thiserror = "1.0"
-tokio = { version = "1.40", features = ["full"] }
-tonic = "0.9.2"
 built = "0.5"
 clap = { version = "4.5.18", features = ["derive"] }
-chrono = "0.4.38"
 raftify = { version = "0.1.78", features = ["heed_storage", "inmemory_storage"] }
 
 [lib]
diff --git a/raftify/Cargo.toml b/raftify/Cargo.toml
index a54c0c89..54e24024 100644
--- a/raftify/Cargo.toml
+++ b/raftify/Cargo.toml
@@ -27,7 +27,6 @@ thiserror = "1.0"
 tokio = { version = "1.40", features = ["full"] }
 tonic = "0.9.2"
 built = "0.5"
-clap = { version = "4.5.18", features = ["derive"] }
 chrono = "0.4.38"
 
 [features]