diff --git a/ethereum/spec/src/main/java/tech/pegasys/teku/spec/schemas/SchemaDefinitionsCapella.java b/ethereum/spec/src/main/java/tech/pegasys/teku/spec/schemas/SchemaDefinitionsCapella.java
index b58434a1e57..b119db05bd1 100644
--- a/ethereum/spec/src/main/java/tech/pegasys/teku/spec/schemas/SchemaDefinitionsCapella.java
+++ b/ethereum/spec/src/main/java/tech/pegasys/teku/spec/schemas/SchemaDefinitionsCapella.java
@@ -26,8 +26,6 @@
 import tech.pegasys.teku.spec.datastructures.builder.BuilderBidSchema;
 import tech.pegasys.teku.spec.datastructures.builder.SignedBuilderBidSchema;
 import tech.pegasys.teku.spec.datastructures.builder.versions.bellatrix.BuilderBidSchemaBellatrix;
-import tech.pegasys.teku.spec.datastructures.execution.ExecutionPayloadHeaderSchema;
-import tech.pegasys.teku.spec.datastructures.execution.versions.capella.ExecutionPayloadHeaderSchemaCapella;
 import tech.pegasys.teku.spec.datastructures.execution.versions.capella.WithdrawalSchema;
 import tech.pegasys.teku.spec.datastructures.operations.BlsToExecutionChangeSchema;
 import tech.pegasys.teku.spec.datastructures.operations.SignedBlsToExecutionChangeSchema;
@@ -41,9 +39,6 @@
 public class SchemaDefinitionsCapella extends SchemaDefinitionsBellatrix {
 
   private final BeaconStateSchemaCapella beaconStateSchema;
-
-  private final ExecutionPayloadHeaderSchemaCapella executionPayloadHeaderSchemaCapella;
-
   private final WithdrawalSchema withdrawalSchema;
 
   private final BlsToExecutionChangeSchema blsToExecutionChangeSchema;
@@ -64,10 +59,8 @@ public SchemaDefinitionsCapella(final SchemaRegistry schemaRegistry) {
     this.withdrawalSchema = schemaRegistry.get(WITHDRAWAL_SCHEMA);
 
     this.beaconStateSchema = BeaconStateSchemaCapella.create(specConfig);
-    this.executionPayloadHeaderSchemaCapella =
-        beaconStateSchema.getLastExecutionPayloadHeaderSchema();
     this.builderBidSchemaCapella =
-        new BuilderBidSchemaBellatrix("BuilderBidCapella", executionPayloadHeaderSchemaCapella);
+        new BuilderBidSchemaBellatrix("BuilderBidCapella", getExecutionPayloadHeaderSchema());
     this.signedBuilderBidSchemaCapella =
         new SignedBuilderBidSchema("SignedBuilderBidCapella", builderBidSchemaCapella);
   }
@@ -87,11 +80,6 @@ public static SchemaDefinitionsCapella required(final SchemaDefinitions schemaDe
     return beaconStateSchema;
   }
 
-  @Override
-  public ExecutionPayloadHeaderSchema<?> getExecutionPayloadHeaderSchema() {
-    return executionPayloadHeaderSchemaCapella;
-  }
-
   @Override
   public BeaconBlockBodyBuilder createBeaconBlockBodyBuilder() {
     return new BeaconBlockBodyBuilderCapella(