diff --git a/Cargo.lock b/Cargo.lock
index 047bdf24a82..929aab20b9e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -743,7 +743,6 @@ version = "0.2.0"
 dependencies = [
  "bitvec 1.0.1",
  "bls",
- "crossbeam-channel",
  "derivative",
  "environment",
  "eth1",
@@ -7856,7 +7855,6 @@ dependencies = [
  "tokio",
  "tree_hash",
  "types",
- "vec_map",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index c1751087c23..b9ed07b58bb 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -106,7 +106,6 @@ c-kzg = "1"
 clap = "2"
 compare_fields_derive = { path = "common/compare_fields_derive" }
 criterion = "0.3"
-crossbeam-channel = "0.5.8"
 delay_map = "0.3"
 derivative = "2"
 dirs = "3"
@@ -146,6 +145,7 @@ rayon = "1.7"
 regex = "1"
 reqwest = { version = "0.11", default-features = false, features = ["blocking", "json", "stream", "rustls-tls", "native-tls-vendored"] }
 ring = "0.16"
+rpds = "0.11"
 rusqlite = { version = "0.28", features = ["bundled"] }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
diff --git a/beacon_node/beacon_chain/Cargo.toml b/beacon_node/beacon_chain/Cargo.toml
index 22ad5d0d6ad..9c7c7febc5f 100644
--- a/beacon_node/beacon_chain/Cargo.toml
+++ b/beacon_node/beacon_chain/Cargo.toml
@@ -21,7 +21,6 @@ serde_json = { workspace = true }
 [dependencies]
 bitvec = { workspace = true }
 bls = { workspace = true }
-crossbeam-channel = { workspace = true }
 derivative = { workspace = true }
 eth1 = { workspace = true }
 eth2 = { workspace = true }
diff --git a/beacon_node/beacon_chain/src/builder.rs b/beacon_node/beacon_chain/src/builder.rs
index 1678b68f0cf..be6b1f9b2bf 100644
--- a/beacon_node/beacon_chain/src/builder.rs
+++ b/beacon_node/beacon_chain/src/builder.rs
@@ -519,12 +519,6 @@ where
         let (_, updated_builder) = self.set_genesis_state(genesis_state)?;
         self = updated_builder;
 
-        // Build the committee caches before storing. The database assumes that states have
-        // committee caches built before storing.
-        weak_subj_state
-            .build_all_committee_caches(&self.spec)
-            .map_err(|e| format!("Error building caches on checkpoint state: {:?}", e))?;
-
         // Fill in the linear block roots between the checkpoint block's slot and the aligned
         // state's slot. All slots less than the block's slot will be handled by block backfill,
         // while states greater or equal to the checkpoint state will be handled by `migrate_db`.
diff --git a/consensus/state_processing/Cargo.toml b/consensus/state_processing/Cargo.toml
index d07763d1825..be5367eb08f 100644
--- a/consensus/state_processing/Cargo.toml
+++ b/consensus/state_processing/Cargo.toml
@@ -28,7 +28,6 @@ arbitrary = { workspace = true }
 lighthouse_metrics = { workspace = true }
 lazy_static = { workspace = true }
 derivative = { workspace = true }
-vec_map = "0.8.2"
 
 [features]
 default = ["legacy-arith"]
diff --git a/consensus/types/Cargo.toml b/consensus/types/Cargo.toml
index 4802481ae82..4b7d9f2b98d 100644
--- a/consensus/types/Cargo.toml
+++ b/consensus/types/Cargo.toml
@@ -53,7 +53,7 @@ smallvec = { workspace = true }
 maplit = { workspace = true }
 strum = { workspace = true }
 milhouse = { workspace = true }
-rpds = "0.11.0"
+rpds = { workspace = true }
 
 [dev-dependencies]
 criterion = { workspace = true }
@@ -70,4 +70,4 @@ sqlite = []
 # The `arbitrary-fuzz` feature is a no-op provided for backwards compatibility.
 # For simplicity `Arbitrary` is now derived regardless of the feature's presence.
 arbitrary-fuzz = []
-portable = ["bls/supranational-portable"]
\ No newline at end of file
+portable = ["bls/supranational-portable"]
diff --git a/consensus/types/src/chain_spec.rs b/consensus/types/src/chain_spec.rs
index ed6e39b8a92..e9345ab14ea 100644
--- a/consensus/types/src/chain_spec.rs
+++ b/consensus/types/src/chain_spec.rs
@@ -309,13 +309,6 @@ impl ChainSpec {
         }
     }
 
-    /// Return the name of the fork activated at `slot`, if any.
-    pub fn fork_activated_at_slot<E: EthSpec>(&self, slot: Slot) -> Option<ForkName> {
-        let prev_slot_fork = self.fork_name_at_slot::<E>(slot.saturating_sub(Slot::new(1)));
-        let slot_fork = self.fork_name_at_slot::<E>(slot);
-        (slot_fork != prev_slot_fork).then_some(slot_fork)
-    }
-
     /// Returns the fork version for a named fork.
     pub fn fork_version_for_name(&self, fork_name: ForkName) -> [u8; 4] {
         match fork_name {
diff --git a/testing/ef_tests/src/cases/ssz_generic.rs b/testing/ef_tests/src/cases/ssz_generic.rs
index e620f4509fc..8de3e217f00 100644
--- a/testing/ef_tests/src/cases/ssz_generic.rs
+++ b/testing/ef_tests/src/cases/ssz_generic.rs
@@ -8,7 +8,7 @@ use serde::{de::Error as SerdeError, Deserialize, Deserializer};
 use ssz_derive::{Decode, Encode};
 use tree_hash_derive::TreeHash;
 use types::typenum::*;
-use types::{BitList, BitVector, ForkName, VariableList, Vector};
+use types::{BitList, BitVector, FixedVector, ForkName, VariableList, Vector};
 
 #[derive(Debug, Clone, Deserialize)]
 struct Metadata {
@@ -139,6 +139,14 @@ impl Case for SszGeneric {
                     [elem_ty => primitive_type]
                     [length => typenum]
                 )?;
+                type_dispatch!(
+                    ssz_generic_test,
+                    (&self.path),
+                    FixedVector,
+                    <>,
+                    [elem_ty => primitive_type]
+                    [length => typenum]
+                )?;
             }
             "bitlist" => {
                 let mut limit = parts[1];