diff --git a/data/dataexchange/src/main/java/tech/pegasys/teku/data/eraFileFormat/EraFile.java b/data/dataexchange/src/main/java/tech/pegasys/teku/data/eraFileFormat/EraFile.java
index ee64be4a9bd..ff1e8e98943 100644
--- a/data/dataexchange/src/main/java/tech/pegasys/teku/data/eraFileFormat/EraFile.java
+++ b/data/dataexchange/src/main/java/tech/pegasys/teku/data/eraFileFormat/EraFile.java
@@ -214,7 +214,7 @@ private void verifyBlocksWithReferenceState(
             block.getParentRoot().equals(previousArchiveLastBlock.getRoot()),
             "First block in archive does not match last block of previous archive.");
       }
-      // TODO should verify signature
+      // when fully implemented, we would check signature also
       ++populatedSlots;
     }
     System.out.println(
diff --git a/ethereum/spec/src/test/java/tech/pegasys/teku/spec/datastructures/state/beaconstate/common/AbstractBeaconStateSchemaTest.java b/ethereum/spec/src/test/java/tech/pegasys/teku/spec/datastructures/state/beaconstate/common/AbstractBeaconStateSchemaTest.java
index 353f9bc3ea1..e112e5f5e2a 100644
--- a/ethereum/spec/src/test/java/tech/pegasys/teku/spec/datastructures/state/beaconstate/common/AbstractBeaconStateSchemaTest.java
+++ b/ethereum/spec/src/test/java/tech/pegasys/teku/spec/datastructures/state/beaconstate/common/AbstractBeaconStateSchemaTest.java
@@ -97,7 +97,6 @@ public void changeSpecConfigTest() {
 
   @Test
   void roundTripViaSsz() {
-    // TODO - generate random version-specific state
     BeaconState beaconState = randomState();
     Bytes bytes = beaconState.sszSerialize();
     BeaconState state = schema.sszDeserialize(bytes);
diff --git a/infrastructure/ssz/src/main/java/tech/pegasys/teku/infrastructure/ssz/schema/SszCollectionSchema.java b/infrastructure/ssz/src/main/java/tech/pegasys/teku/infrastructure/ssz/schema/SszCollectionSchema.java
index 3b672c40c10..4484373b73c 100644
--- a/infrastructure/ssz/src/main/java/tech/pegasys/teku/infrastructure/ssz/schema/SszCollectionSchema.java
+++ b/infrastructure/ssz/src/main/java/tech/pegasys/teku/infrastructure/ssz/schema/SszCollectionSchema.java
@@ -49,7 +49,6 @@ default SszCollectionT createFromElements(final List<? extends SszElementT> elem
   }
 
   default TreeNode createTreeFromElements(final List<? extends SszElementT> elements) {
-    // TODO: probably suboptimal method implementation:
     // This is a generic implementation which works for both Vector and List but it potentially
     // could do better if construct the tree directly in List/Vector subclasses
     checkArgument(elements.size() <= getMaxLength(), "Too many elements for this collection type");
diff --git a/networking/eth2/src/main/java/tech/pegasys/teku/networking/eth2/gossip/config/ScoringConfig.java b/networking/eth2/src/main/java/tech/pegasys/teku/networking/eth2/gossip/config/ScoringConfig.java
index e35bb4370bc..edf1e1905ef 100644
--- a/networking/eth2/src/main/java/tech/pegasys/teku/networking/eth2/gossip/config/ScoringConfig.java
+++ b/networking/eth2/src/main/java/tech/pegasys/teku/networking/eth2/gossip/config/ScoringConfig.java
@@ -54,8 +54,6 @@ class ScoringConfig {
 
   private ScoringConfig(final Spec spec, final int d) {
     this.spec = spec;
-    // TODO(#3356) Use spec provider through-out rather than relying only on genesis constants and
-    //  genesis spec
     this.genesisConfig = spec.getGenesisSpecConfig();
     this.genesisSpec = spec.getGenesisSpec();
     this.d = d;
diff --git a/networking/p2p/src/main/java/tech/pegasys/teku/networking/p2p/libp2p/LibP2PNetworkBuilder.java b/networking/p2p/src/main/java/tech/pegasys/teku/networking/p2p/libp2p/LibP2PNetworkBuilder.java
index 5b809f77d14..10a79d33644 100644
--- a/networking/p2p/src/main/java/tech/pegasys/teku/networking/p2p/libp2p/LibP2PNetworkBuilder.java
+++ b/networking/p2p/src/main/java/tech/pegasys/teku/networking/p2p/libp2p/LibP2PNetworkBuilder.java
@@ -215,11 +215,9 @@ protected Host createHost(final PrivKey privKey, final List<Multiaddr> advertise
           b.getTransports().add(TcpTransport::new);
           b.getSecureChannels().add(NoiseXXSecureChannel::new);
 
-          // yamux MUST take precedence during negotiation
+          // Yamux must take precedence during negotiation
           if (config.isYamuxEnabled()) {
-            // TODO: https://github.com/Consensys/teku/issues/7532
-            final int maxBufferedConnectionWrites = 150 * 1024 * 1024;
-            b.getMuxers().add(StreamMuxerProtocol.getYamux(maxBufferedConnectionWrites));
+            b.getMuxers().add(StreamMuxerProtocol.getYamux());
           }
           b.getMuxers().add(StreamMuxerProtocol.getMplex());
 
diff --git a/validator/client/src/main/java/tech/pegasys/teku/validator/client/loader/SlashingProtectedValidatorSource.java b/validator/client/src/main/java/tech/pegasys/teku/validator/client/loader/SlashingProtectedValidatorSource.java
index 08abd012b6e..85d76ec62ab 100644
--- a/validator/client/src/main/java/tech/pegasys/teku/validator/client/loader/SlashingProtectedValidatorSource.java
+++ b/validator/client/src/main/java/tech/pegasys/teku/validator/client/loader/SlashingProtectedValidatorSource.java
@@ -90,8 +90,6 @@ public boolean isReadOnly() {
 
     @Override
     public Signer createSigner() {
-      // TODO: Consider caching these to guarantee we can't possible use different
-      // `SlashingProtectedSigner` instances with the same key
       return new SlashingProtectedSigner(
           getPublicKey(), slashingProtector, delegate.createSigner());
     }