diff --git a/crates/payload/builder/src/payload.rs b/crates/payload/builder/src/payload.rs
index 57d0dceff1..65e7b0ad2f 100644
--- a/crates/payload/builder/src/payload.rs
+++ b/crates/payload/builder/src/payload.rs
@@ -81,10 +81,6 @@ impl From<BuiltPayload> for ExecutionPayloadV1 {
 }
 
 // V2 engine_getPayloadV2 response
-// TODO(rjected): we could improve this by wrapping envelope / payload types by version, so we can
-// have explicitly versioned return types for getPayload. Then BuiltPayload could essentially be a
-// builder for those types, and it would not be possible to e.g. return cancun fields for a
-// pre-cancun endpoint.
 impl From<BuiltPayload> for ExecutionPayloadEnvelopeV2 {
     fn from(value: BuiltPayload) -> Self {
         let BuiltPayload { block, fees, .. } = value;
diff --git a/crates/rpc/rpc-engine-api/src/engine_api.rs b/crates/rpc/rpc-engine-api/src/engine_api.rs
index 30fb4826c7..2290bc3216 100644
--- a/crates/rpc/rpc-engine-api/src/engine_api.rs
+++ b/crates/rpc/rpc-engine-api/src/engine_api.rs
@@ -104,7 +104,6 @@ where
 
         let cancun_fields = CancunPayloadFields { versioned_hashes, parent_beacon_block_root };
 
-        // TODO: validate versioned hashes and figure out what to do with parent_beacon_block_root
         Ok(self.inner.beacon_consensus.new_payload(payload, Some(cancun_fields)).await?)
     }