diff --git a/builder-oapi.yaml b/builder-oapi.yaml
index 86a0768..8cf1042 100644
--- a/builder-oapi.yaml
+++ b/builder-oapi.yaml
@@ -51,130 +51,24 @@ paths:
 
 components:
   schemas:
-    BeaconState:
-      $ref: './beacon-apis/types/state.yaml#/BeaconState'
-    BeaconBlock:
-      $ref: './beacon-apis/types/block.yaml#/BeaconBlock'
-    SignedBeaconBlock:
-      $ref: './beacon-apis/types/block.yaml#/SignedBeaconBlock'
-    SignedBeaconBlockHeader:
-      $ref: './beacon-apis/types/block.yaml#/SignedBeaconBlockHeader'
-    ValidatorResponse:
-      $ref: './beacon-apis/types/api.yaml#/ValidatorResponse'
-    ValidatorBalanceResponse:
-      $ref: './beacon-apis/types/api.yaml#/ValidatorBalanceResponse'
-    ValidatorStatus:
-      $ref: './beacon-apis/types/api.yaml#/ValidatorStatus'
-    Committee:
-      $ref: './beacon-apis/types/api.yaml#/Committee'
-    AttesterSlashing:
-      $ref: './beacon-apis/types/attester_slashing.yaml#/AttesterSlashing'
-    ProposerSlashing:
-      $ref: './beacon-apis/types/proposer_slashing.yaml#/ProposerSlashing'
-    SignedVoluntaryExit:
-      $ref: './beacon-apis/types/voluntary_exit.yaml#/SignedVoluntaryExit'
-    AttesterDuty:
-      $ref: './beacon-apis/types/validator.yaml#/AttesterDuty'
-    ProposerDuty:
-      $ref: './beacon-apis/types/validator.yaml#/ProposerDuty'
-    Altair.SyncDuty:
-      $ref: './beacon-apis/types/validator.yaml#/Altair/SyncDuty'
-    SignedAggregateAndProof:
-      $ref: './beacon-apis/types/validator.yaml#/SignedAggregateAndProof'
-    Attestation:
-      $ref: './beacon-apis/types/attestation.yaml#/Attestation'
-    AttestationData:
-      $ref: './beacon-apis/types/attestation.yaml#/AttestationData'
-    Fork:
-      $ref: './beacon-apis/types/misc.yaml#/Fork'
-    Checkpoint:
-      $ref: './beacon-apis/types/misc.yaml#/Checkpoint'
     Uint64:
       $ref: './beacon-apis/types/primitive.yaml#/Uint64'
-    GenesisTime:
-      $ref: './beacon-apis/types/primitive.yaml#/GenesisTime'
-    Version:
-      $ref: './beacon-apis/types/primitive.yaml#/Version'
-    ForkVersion:
-      $ref: './beacon-apis/types/primitive.yaml#/ForkVersion'
-    DependentRoot:
-      $ref: './beacon-apis/types/primitive.yaml#/DependentRoot'
-    ExecutionOptimistic:
-      $ref: './beacon-apis/types/primitive.yaml#/ExecutionOptimistic'
     Root:
       $ref: './beacon-apis/types/primitive.yaml#/Root'
-    Hex:
-      $ref: './beacon-apis/types/primitive.yaml#/Hex'
-    Graffiti:
-      $ref: './beacon-apis/types/primitive.yaml#/Graffiti'
     Pubkey:
       $ref: './beacon-apis/types/primitive.yaml#/Pubkey'
-    Signature:
-      $ref: './beacon-apis/types/primitive.yaml#/Signature'
     ErrorMessage:
       $ref: './beacon-apis/types/http.yaml#/ErrorMessage'
-    IndexedErrorMessage:
-      $ref: './beacon-apis/types/http.yaml#/IndexedErrorMessage'
-    Altair.SignedBeaconBlock:
-      $ref: './beacon-apis/types/altair/block.yaml#/Altair/SignedBeaconBlock'
-    Altair.BeaconBlock:
-      $ref: './beacon-apis/types/altair/block.yaml#/Altair/BeaconBlock'
-    Altair.BeaconState:
-      $ref: './beacon-apis/types/altair/state.yaml#/Altair/BeaconState'
-    Altair.SyncCommitteeSignature:
-      $ref: './beacon-apis/types/altair/sync_committee.yaml#/Altair/SyncCommitteeSignature'
-    Altair.SyncCommitteeSubscription:
-      $ref: './beacon-apis/types/altair/sync_committee.yaml#/Altair/SyncCommitteeSubscription'
-    Altair.ContributionAndProof:
-      $ref: './beacon-apis/types/altair/sync_committee.yaml#/Altair/ContributionAndProof'
-    Altair.SignedContributionAndProof:
-      $ref: './beacon-apis/types/altair/sync_committee.yaml#/Altair/SignedContributionAndProof'
-    Altair.SyncCommitteeContribution:
-      $ref: './beacon-apis/types/altair/sync_committee.yaml#/Altair/SyncCommitteeContribution'
-    Altair.SyncCommittee:
-      $ref: './beacon-apis/types/altair/sync_committee.yaml#/Altair/SyncCommitteeByValidatorIndices'
-    ExecutionAddress:
-      $ref: './beacon-apis/types/primitive.yaml#/ExecutionAddress'
-    Bellatrix.BeaconState:
-      $ref: './beacon-apis/types/bellatrix/state.yaml#/Bellatrix/BeaconState'
     Bellatrix.ExecutionPayload:
       $ref: './beacon-apis/types/bellatrix/execution_payload.yaml#/Bellatrix/ExecutionPayload'
     Bellatrix.ExecutionPayloadHeader:
       $ref: './beacon-apis/types/bellatrix/execution_payload.yaml#/Bellatrix/ExecutionPayloadHeader'
-    Bellatrix.BeaconBlock:
-      $ref: './beacon-apis/types/bellatrix/block.yaml#/Bellatrix/BeaconBlock'
-    Bellatrix.SignedBeaconBlock:
-      $ref: './beacon-apis/types/bellatrix/block.yaml#/Bellatrix/SignedBeaconBlock'
-    Bellatrix.BlindedBeaconBlock:
-      $ref: './beacon-apis/types/bellatrix/block.yaml#/Bellatrix/BlindedBeaconBlock'
     Bellatrix.SignedBlindedBeaconBlock:
       $ref: './beacon-apis/types/bellatrix/block.yaml#/Bellatrix/SignedBlindedBeaconBlock'
 
-    ValidatorRegistration:
-      $ref: './types/registration.yaml#/ValidatorRegistration'
     SignedValidatorRegistration:
       $ref: './types/registration.yaml#/SignedValidatorRegistration'
 
-  parameters:
-    StateId:
-      $ref: './beacon-apis/params/index.yaml#/StateId'
-    BlockId:
-      $ref: './beacon-apis/params/index.yaml#/BlockId'
-
   responses:
-    InvalidRequest:
-      $ref: './beacon-apis/types/http.yaml#/InvalidRequest'
-    NotFound:
-      $ref: './beacon-apis/types/http.yaml#/NotFound'
     InternalError:
       $ref: './beacon-apis/types/http.yaml#/InternalError'
-    CurrentlySyncing:
-      $ref: './beacon-apis/types/http.yaml#/CurrentlySyncing'
-
-  headers:
-    Eth-Consensus-Version:
-      description: Required in response so client can deserialize returned json or ssz data more effectively.
-      schema:
-        type: string
-        enum: [phase0, altair, bellatrix]
-        example: "phase0"