diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Account.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Account.java
index 6f9aa220902..e4d27581140 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Account.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Account.java
@@ -105,7 +105,6 @@ private Account(Builder builder) {
         ValidationSupport.checkReferenceType(subject, "subject", "Patient", "Device", "Practitioner", "PractitionerRole", "Location", "HealthcareService", "Organization");
         ValidationSupport.checkReferenceType(owner, "owner", "Organization");
         ValidationSupport.checkReferenceType(partOf, "partOf", "Account");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/ActivityDefinition.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/ActivityDefinition.java
index bdd02f20e3e..b6303a9bc80 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/ActivityDefinition.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/ActivityDefinition.java
@@ -283,7 +283,6 @@ private ActivityDefinition(Builder builder) {
         ValidationSupport.checkReferenceType(specimenRequirement, "specimenRequirement", "SpecimenDefinition");
         ValidationSupport.checkReferenceType(observationRequirement, "observationRequirement", "ObservationDefinition");
         ValidationSupport.checkReferenceType(observationResultRequirement, "observationResultRequirement", "ObservationDefinition");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/AdverseEvent.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/AdverseEvent.java
index 2c4d44acf34..1cc6c6c2720 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/AdverseEvent.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/AdverseEvent.java
@@ -181,7 +181,6 @@ private AdverseEvent(Builder builder) {
         ValidationSupport.checkReferenceType(subjectMedicalHistory, "subjectMedicalHistory", "Condition", "Observation", "AllergyIntolerance", "FamilyMemberHistory", "Immunization", "Procedure", "Media", "DocumentReference");
         ValidationSupport.checkReferenceType(referenceDocument, "referenceDocument", "DocumentReference");
         ValidationSupport.checkReferenceType(study, "study", "ResearchStudy");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/AllergyIntolerance.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/AllergyIntolerance.java
index e4223c395d3..ec564f3a43b 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/AllergyIntolerance.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/AllergyIntolerance.java
@@ -166,7 +166,6 @@ private AllergyIntolerance(Builder builder) {
         ValidationSupport.checkReferenceType(encounter, "encounter", "Encounter");
         ValidationSupport.checkReferenceType(recorder, "recorder", "Practitioner", "PractitionerRole", "Patient", "RelatedPerson");
         ValidationSupport.checkReferenceType(asserter, "asserter", "Patient", "RelatedPerson", "Practitioner", "PractitionerRole");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Appointment.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Appointment.java
index 1bc3c1d7354..2e0e5d5cf8a 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Appointment.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Appointment.java
@@ -219,7 +219,6 @@ private Appointment(Builder builder) {
         ValidationSupport.checkReferenceType(reasonReference, "reasonReference", "Condition", "Procedure", "Observation", "ImmunizationRecommendation");
         ValidationSupport.checkReferenceType(slot, "slot", "Slot");
         ValidationSupport.checkReferenceType(basedOn, "basedOn", "ServiceRequest");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/AppointmentResponse.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/AppointmentResponse.java
index fa5141770fa..4851b54c2fc 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/AppointmentResponse.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/AppointmentResponse.java
@@ -106,7 +106,6 @@ private AppointmentResponse(Builder builder) {
         comment = builder.comment;
         ValidationSupport.checkReferenceType(appointment, "appointment", "Appointment");
         ValidationSupport.checkReferenceType(actor, "actor", "Patient", "Practitioner", "PractitionerRole", "RelatedPerson", "Device", "HealthcareService", "Location");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/AuditEvent.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/AuditEvent.java
index 4f1b0cf0b25..b0f06efec40 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/AuditEvent.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/AuditEvent.java
@@ -219,7 +219,6 @@ private AuditEvent(Builder builder) {
         agent = Collections.unmodifiableList(ValidationSupport.checkNonEmptyList(builder.agent, "agent", Agent.class));
         source = ValidationSupport.requireNonNull(builder.source, "source");
         entity = Collections.unmodifiableList(ValidationSupport.checkList(builder.entity, "entity", Entity.class));
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Basic.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Basic.java
index 78b1e5b7760..1fafc8e7f3a 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Basic.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Basic.java
@@ -74,7 +74,6 @@ private Basic(Builder builder) {
         created = builder.created;
         author = builder.author;
         ValidationSupport.checkReferenceType(author, "author", "Practitioner", "PractitionerRole", "Patient", "RelatedPerson", "Organization");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Binary.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Binary.java
index 515f87b6795..a6ef92a7434 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Binary.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Binary.java
@@ -56,7 +56,6 @@ private Binary(Builder builder) {
         contentType = ValidationSupport.requireNonNull(builder.contentType, "contentType");
         securityContext = builder.securityContext;
         data = builder.data;
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/BiologicallyDerivedProduct.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/BiologicallyDerivedProduct.java
index 2d1b35798ba..e3233e7ae94 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/BiologicallyDerivedProduct.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/BiologicallyDerivedProduct.java
@@ -102,7 +102,6 @@ private BiologicallyDerivedProduct(Builder builder) {
         storage = Collections.unmodifiableList(ValidationSupport.checkList(builder.storage, "storage", Storage.class));
         ValidationSupport.checkReferenceType(request, "request", "ServiceRequest");
         ValidationSupport.checkReferenceType(parent, "parent", "BiologicallyDerivedProduct");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/BodyStructure.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/BodyStructure.java
index 42faa83879a..40b5313a96b 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/BodyStructure.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/BodyStructure.java
@@ -95,7 +95,6 @@ private BodyStructure(Builder builder) {
         image = Collections.unmodifiableList(ValidationSupport.checkList(builder.image, "image", Attachment.class));
         patient = ValidationSupport.requireNonNull(builder.patient, "patient");
         ValidationSupport.checkReferenceType(patient, "patient", "Patient");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Bundle.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Bundle.java
index c8314270a80..4ed95641c87 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Bundle.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Bundle.java
@@ -159,7 +159,6 @@ private Bundle(Builder builder) {
         link = Collections.unmodifiableList(ValidationSupport.checkList(builder.link, "link", Link.class));
         entry = Collections.unmodifiableList(ValidationSupport.checkList(builder.entry, "entry", Entry.class));
         signature = builder.signature;
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/CapabilityStatement.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/CapabilityStatement.java
index 8f9f2560497..0be6c418535 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/CapabilityStatement.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/CapabilityStatement.java
@@ -285,7 +285,6 @@ private CapabilityStatement(Builder builder) {
         rest = Collections.unmodifiableList(ValidationSupport.checkList(builder.rest, "rest", Rest.class));
         messaging = Collections.unmodifiableList(ValidationSupport.checkList(builder.messaging, "messaging", Messaging.class));
         document = Collections.unmodifiableList(ValidationSupport.checkList(builder.document, "document", Document.class));
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/CarePlan.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/CarePlan.java
index 7c19cd5a205..75e48fc3a55 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/CarePlan.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/CarePlan.java
@@ -176,7 +176,6 @@ private CarePlan(Builder builder) {
         ValidationSupport.checkReferenceType(careTeam, "careTeam", "CareTeam");
         ValidationSupport.checkReferenceType(addresses, "addresses", "Condition");
         ValidationSupport.checkReferenceType(goal, "goal", "Goal");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/CareTeam.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/CareTeam.java
index f46910ce339..8359ee1455c 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/CareTeam.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/CareTeam.java
@@ -122,7 +122,6 @@ private CareTeam(Builder builder) {
         ValidationSupport.checkReferenceType(encounter, "encounter", "Encounter");
         ValidationSupport.checkReferenceType(reasonReference, "reasonReference", "Condition");
         ValidationSupport.checkReferenceType(managingOrganization, "managingOrganization", "Organization");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/CatalogEntry.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/CatalogEntry.java
index 2739309ceb3..746dd860052 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/CatalogEntry.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/CatalogEntry.java
@@ -93,7 +93,6 @@ private CatalogEntry(Builder builder) {
         additionalClassification = Collections.unmodifiableList(ValidationSupport.checkList(builder.additionalClassification, "additionalClassification", CodeableConcept.class));
         relatedEntry = Collections.unmodifiableList(ValidationSupport.checkList(builder.relatedEntry, "relatedEntry", RelatedEntry.class));
         ValidationSupport.checkReferenceType(referencedItem, "referencedItem", "Medication", "Device", "Organization", "Practitioner", "PractitionerRole", "HealthcareService", "ActivityDefinition", "PlanDefinition", "SpecimenDefinition", "ObservationDefinition", "Binary");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/ChargeItem.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/ChargeItem.java
index 93b6dccb354..350469dcab9 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/ChargeItem.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/ChargeItem.java
@@ -182,7 +182,6 @@ private ChargeItem(Builder builder) {
         ValidationSupport.checkReferenceType(service, "service", "DiagnosticReport", "ImagingStudy", "Immunization", "MedicationAdministration", "MedicationDispense", "Observation", "Procedure", "SupplyDelivery");
         ValidationSupport.checkReferenceType(product, "product", "Device", "Medication", "Substance");
         ValidationSupport.checkReferenceType(account, "account", "Account");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/ChargeItemDefinition.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/ChargeItemDefinition.java
index cfb39207841..13e0447a9cd 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/ChargeItemDefinition.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/ChargeItemDefinition.java
@@ -165,7 +165,6 @@ private ChargeItemDefinition(Builder builder) {
         applicability = Collections.unmodifiableList(ValidationSupport.checkList(builder.applicability, "applicability", Applicability.class));
         propertyGroup = Collections.unmodifiableList(ValidationSupport.checkList(builder.propertyGroup, "propertyGroup", PropertyGroup.class));
         ValidationSupport.checkReferenceType(instance, "instance", "Medication", "Substance", "Device");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Claim.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Claim.java
index e438e76ae45..eb1707963f3 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Claim.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Claim.java
@@ -207,7 +207,6 @@ private Claim(Builder builder) {
         ValidationSupport.checkReferenceType(originalPrescription, "originalPrescription", "DeviceRequest", "MedicationRequest", "VisionPrescription");
         ValidationSupport.checkReferenceType(referral, "referral", "ServiceRequest");
         ValidationSupport.checkReferenceType(facility, "facility", "Location");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/ClaimResponse.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/ClaimResponse.java
index 115f3323253..28141f186c8 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/ClaimResponse.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/ClaimResponse.java
@@ -211,7 +211,6 @@ private ClaimResponse(Builder builder) {
         ValidationSupport.checkReferenceType(requestor, "requestor", "Practitioner", "PractitionerRole", "Organization");
         ValidationSupport.checkReferenceType(request, "request", "Claim");
         ValidationSupport.checkReferenceType(communicationRequest, "communicationRequest", "CommunicationRequest");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/ClinicalImpression.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/ClinicalImpression.java
index 59471ac1d1c..a998de1aab5 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/ClinicalImpression.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/ClinicalImpression.java
@@ -147,7 +147,6 @@ private ClinicalImpression(Builder builder) {
         ValidationSupport.checkReferenceType(previous, "previous", "ClinicalImpression");
         ValidationSupport.checkReferenceType(problem, "problem", "Condition", "AllergyIntolerance");
         ValidationSupport.checkReferenceType(prognosisReference, "prognosisReference", "RiskAssessment");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/CodeSystem.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/CodeSystem.java
index af1da9617e4..cb0a403e311 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/CodeSystem.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/CodeSystem.java
@@ -205,7 +205,6 @@ private CodeSystem(Builder builder) {
         filter = Collections.unmodifiableList(ValidationSupport.checkList(builder.filter, "filter", Filter.class));
         property = Collections.unmodifiableList(ValidationSupport.checkList(builder.property, "property", Property.class));
         concept = Collections.unmodifiableList(ValidationSupport.checkList(builder.concept, "concept", Concept.class));
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Communication.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Communication.java
index c258d5d4397..b9a635391c8 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Communication.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Communication.java
@@ -172,7 +172,6 @@ private Communication(Builder builder) {
         ValidationSupport.checkReferenceType(recipient, "recipient", "Device", "Organization", "Patient", "Practitioner", "PractitionerRole", "RelatedPerson", "Group", "CareTeam", "HealthcareService");
         ValidationSupport.checkReferenceType(sender, "sender", "Device", "Organization", "Patient", "Practitioner", "PractitionerRole", "RelatedPerson", "HealthcareService");
         ValidationSupport.checkReferenceType(reasonReference, "reasonReference", "Condition", "Observation", "DiagnosticReport", "DocumentReference");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/CommunicationRequest.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/CommunicationRequest.java
index 199acff01fc..4518895b45a 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/CommunicationRequest.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/CommunicationRequest.java
@@ -169,7 +169,6 @@ private CommunicationRequest(Builder builder) {
         ValidationSupport.checkReferenceType(recipient, "recipient", "Device", "Organization", "Patient", "Practitioner", "PractitionerRole", "RelatedPerson", "Group", "CareTeam", "HealthcareService");
         ValidationSupport.checkReferenceType(sender, "sender", "Device", "Organization", "Patient", "Practitioner", "PractitionerRole", "RelatedPerson", "HealthcareService");
         ValidationSupport.checkReferenceType(reasonReference, "reasonReference", "Condition", "Observation", "DiagnosticReport", "DocumentReference");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/CompartmentDefinition.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/CompartmentDefinition.java
index 9d985b49783..1c071331c77 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/CompartmentDefinition.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/CompartmentDefinition.java
@@ -119,7 +119,6 @@ private CompartmentDefinition(Builder builder) {
         code = ValidationSupport.requireNonNull(builder.code, "code");
         search = ValidationSupport.requireNonNull(builder.search, "search");
         resource = Collections.unmodifiableList(ValidationSupport.checkList(builder.resource, "resource", Resource.class));
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Composition.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Composition.java
index 381084b7d84..cbf6aeb999e 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Composition.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Composition.java
@@ -180,7 +180,6 @@ private Composition(Builder builder) {
         ValidationSupport.checkReferenceType(encounter, "encounter", "Encounter");
         ValidationSupport.checkReferenceType(author, "author", "Practitioner", "PractitionerRole", "Device", "Patient", "RelatedPerson", "Organization");
         ValidationSupport.checkReferenceType(custodian, "custodian", "Organization");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/ConceptMap.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/ConceptMap.java
index 8ece1d8f295..f4b65fabfa6 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/ConceptMap.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/ConceptMap.java
@@ -162,7 +162,6 @@ private ConceptMap(Builder builder) {
         source = ValidationSupport.choiceElement(builder.source, "source", Uri.class, Canonical.class);
         target = ValidationSupport.choiceElement(builder.target, "target", Uri.class, Canonical.class);
         group = Collections.unmodifiableList(ValidationSupport.checkList(builder.group, "group", Group.class));
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Condition.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Condition.java
index 658db9c7d80..18329a03081 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Condition.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Condition.java
@@ -204,7 +204,6 @@ private Condition(Builder builder) {
         ValidationSupport.checkReferenceType(encounter, "encounter", "Encounter");
         ValidationSupport.checkReferenceType(recorder, "recorder", "Practitioner", "PractitionerRole", "Patient", "RelatedPerson");
         ValidationSupport.checkReferenceType(asserter, "asserter", "Practitioner", "PractitionerRole", "Patient", "RelatedPerson");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Consent.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Consent.java
index 551807934be..c3210d60417 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Consent.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Consent.java
@@ -226,7 +226,6 @@ private Consent(Builder builder) {
         ValidationSupport.checkReferenceType(performer, "performer", "Organization", "Patient", "Practitioner", "RelatedPerson", "PractitionerRole");
         ValidationSupport.checkReferenceType(organization, "organization", "Organization");
         ValidationSupport.checkReferenceType(source, "source", "Consent", "DocumentReference", "Contract", "QuestionnaireResponse");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Contract.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Contract.java
index 4f77b470035..6a6a2376f0b 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Contract.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Contract.java
@@ -238,7 +238,6 @@ private Contract(Builder builder) {
         ValidationSupport.checkReferenceType(author, "author", "Patient", "Practitioner", "PractitionerRole", "Organization");
         ValidationSupport.checkReferenceType(relevantHistory, "relevantHistory", "Provenance");
         ValidationSupport.checkReferenceType(legallyBinding, "legallyBinding", "Composition", "DocumentReference", "QuestionnaireResponse", "Contract");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Coverage.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Coverage.java
index 1d1fb50b91e..07651e701f2 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Coverage.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Coverage.java
@@ -169,7 +169,6 @@ private Coverage(Builder builder) {
         ValidationSupport.checkReferenceType(beneficiary, "beneficiary", "Patient");
         ValidationSupport.checkReferenceType(payor, "payor", "Organization", "Patient", "RelatedPerson");
         ValidationSupport.checkReferenceType(contract, "contract", "Contract");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/CoverageEligibilityRequest.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/CoverageEligibilityRequest.java
index 7411fe867e3..05cb0cc6bda 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/CoverageEligibilityRequest.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/CoverageEligibilityRequest.java
@@ -130,7 +130,6 @@ private CoverageEligibilityRequest(Builder builder) {
         ValidationSupport.checkReferenceType(provider, "provider", "Practitioner", "PractitionerRole", "Organization");
         ValidationSupport.checkReferenceType(insurer, "insurer", "Organization");
         ValidationSupport.checkReferenceType(facility, "facility", "Location");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/CoverageEligibilityResponse.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/CoverageEligibilityResponse.java
index 8003e50490d..eb5beec33d6 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/CoverageEligibilityResponse.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/CoverageEligibilityResponse.java
@@ -146,7 +146,6 @@ private CoverageEligibilityResponse(Builder builder) {
         ValidationSupport.checkReferenceType(requestor, "requestor", "Practitioner", "PractitionerRole", "Organization");
         ValidationSupport.checkReferenceType(request, "request", "CoverageEligibilityRequest");
         ValidationSupport.checkReferenceType(insurer, "insurer", "Organization");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/DetectedIssue.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/DetectedIssue.java
index ae4c4b86743..7ac5c847eee 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/DetectedIssue.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/DetectedIssue.java
@@ -130,7 +130,6 @@ private DetectedIssue(Builder builder) {
         mitigation = Collections.unmodifiableList(ValidationSupport.checkList(builder.mitigation, "mitigation", Mitigation.class));
         ValidationSupport.checkReferenceType(patient, "patient", "Patient");
         ValidationSupport.checkReferenceType(author, "author", "Practitioner", "PractitionerRole", "Device");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Device.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Device.java
index b2f81691455..2c786ebf35e 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Device.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Device.java
@@ -151,7 +151,6 @@ private Device(Builder builder) {
         ValidationSupport.checkReferenceType(owner, "owner", "Organization");
         ValidationSupport.checkReferenceType(location, "location", "Location");
         ValidationSupport.checkReferenceType(parent, "parent", "Device");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/DeviceDefinition.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/DeviceDefinition.java
index ae3c9538310..c35fa7412c4 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/DeviceDefinition.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/DeviceDefinition.java
@@ -123,7 +123,6 @@ private DeviceDefinition(Builder builder) {
         ValidationSupport.checkReferenceType(manufacturer, "manufacturer", "Organization");
         ValidationSupport.checkReferenceType(owner, "owner", "Organization");
         ValidationSupport.checkReferenceType(parentDevice, "parentDevice", "DeviceDefinition");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/DeviceMetric.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/DeviceMetric.java
index a7aa1e4cdfe..cdc36f5a1fe 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/DeviceMetric.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/DeviceMetric.java
@@ -139,7 +139,6 @@ private DeviceMetric(Builder builder) {
         calibration = Collections.unmodifiableList(ValidationSupport.checkList(builder.calibration, "calibration", Calibration.class));
         ValidationSupport.checkReferenceType(source, "source", "Device");
         ValidationSupport.checkReferenceType(parent, "parent", "Device");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/DeviceRequest.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/DeviceRequest.java
index b77536d190c..5171f7281d2 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/DeviceRequest.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/DeviceRequest.java
@@ -187,7 +187,6 @@ private DeviceRequest(Builder builder) {
         ValidationSupport.checkReferenceType(reasonReference, "reasonReference", "Condition", "Observation", "DiagnosticReport", "DocumentReference");
         ValidationSupport.checkReferenceType(insurance, "insurance", "Coverage", "ClaimResponse");
         ValidationSupport.checkReferenceType(relevantHistory, "relevantHistory", "Provenance");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/DeviceUseStatement.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/DeviceUseStatement.java
index 6c28db16561..d93fef328d8 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/DeviceUseStatement.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/DeviceUseStatement.java
@@ -122,7 +122,6 @@ private DeviceUseStatement(Builder builder) {
         ValidationSupport.checkReferenceType(source, "source", "Patient", "Practitioner", "PractitionerRole", "RelatedPerson");
         ValidationSupport.checkReferenceType(device, "device", "Device");
         ValidationSupport.checkReferenceType(reasonReference, "reasonReference", "Condition", "Observation", "DiagnosticReport", "DocumentReference", "Media");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/DiagnosticReport.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/DiagnosticReport.java
index 83bf8b83e9e..a4b4247a1a4 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/DiagnosticReport.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/DiagnosticReport.java
@@ -159,7 +159,6 @@ private DiagnosticReport(Builder builder) {
         ValidationSupport.checkReferenceType(specimen, "specimen", "Specimen");
         ValidationSupport.checkReferenceType(result, "result", "Observation");
         ValidationSupport.checkReferenceType(imagingStudy, "imagingStudy", "ImagingStudy");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/DocumentManifest.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/DocumentManifest.java
index 772d2d8ba4d..71c6ae00206 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/DocumentManifest.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/DocumentManifest.java
@@ -104,7 +104,6 @@ private DocumentManifest(Builder builder) {
         ValidationSupport.checkReferenceType(subject, "subject", "Patient", "Practitioner", "Group", "Device");
         ValidationSupport.checkReferenceType(author, "author", "Practitioner", "PractitionerRole", "Organization", "Device", "Patient", "RelatedPerson");
         ValidationSupport.checkReferenceType(recipient, "recipient", "Patient", "Practitioner", "PractitionerRole", "RelatedPerson", "Organization");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/DocumentReference.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/DocumentReference.java
index f76b204d1bf..d86299fef33 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/DocumentReference.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/DocumentReference.java
@@ -170,7 +170,6 @@ private DocumentReference(Builder builder) {
         ValidationSupport.checkReferenceType(author, "author", "Practitioner", "PractitionerRole", "Organization", "Device", "Patient", "RelatedPerson");
         ValidationSupport.checkReferenceType(authenticator, "authenticator", "Practitioner", "PractitionerRole", "Organization");
         ValidationSupport.checkReferenceType(custodian, "custodian", "Organization");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/EffectEvidenceSynthesis.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/EffectEvidenceSynthesis.java
index 60376cc1011..fadb2c7e383 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/EffectEvidenceSynthesis.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/EffectEvidenceSynthesis.java
@@ -278,7 +278,6 @@ private EffectEvidenceSynthesis(Builder builder) {
         ValidationSupport.checkReferenceType(exposure, "exposure", "EvidenceVariable");
         ValidationSupport.checkReferenceType(exposureAlternative, "exposureAlternative", "EvidenceVariable");
         ValidationSupport.checkReferenceType(outcome, "outcome", "EvidenceVariable");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Encounter.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Encounter.java
index 5ffda21c90d..46822c9ca82 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Encounter.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Encounter.java
@@ -233,7 +233,6 @@ private Encounter(Builder builder) {
         ValidationSupport.checkReferenceType(account, "account", "Account");
         ValidationSupport.checkReferenceType(serviceProvider, "serviceProvider", "Organization");
         ValidationSupport.checkReferenceType(partOf, "partOf", "Encounter");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Endpoint.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Endpoint.java
index f3d24b506f5..497fb881a5b 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Endpoint.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Endpoint.java
@@ -123,7 +123,6 @@ private Endpoint(Builder builder) {
         address = ValidationSupport.requireNonNull(builder.address, "address");
         header = Collections.unmodifiableList(ValidationSupport.checkList(builder.header, "header", String.class));
         ValidationSupport.checkReferenceType(managingOrganization, "managingOrganization", "Organization");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/EnrollmentRequest.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/EnrollmentRequest.java
index d8015d7e471..c74da7ad648 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/EnrollmentRequest.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/EnrollmentRequest.java
@@ -77,7 +77,6 @@ private EnrollmentRequest(Builder builder) {
         ValidationSupport.checkReferenceType(provider, "provider", "Practitioner", "PractitionerRole", "Organization");
         ValidationSupport.checkReferenceType(candidate, "candidate", "Patient");
         ValidationSupport.checkReferenceType(coverage, "coverage", "Coverage");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/EnrollmentResponse.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/EnrollmentResponse.java
index 2391839d2c0..dcdaa1b4981 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/EnrollmentResponse.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/EnrollmentResponse.java
@@ -85,7 +85,6 @@ private EnrollmentResponse(Builder builder) {
         ValidationSupport.checkReferenceType(request, "request", "EnrollmentRequest");
         ValidationSupport.checkReferenceType(organization, "organization", "Organization");
         ValidationSupport.checkReferenceType(requestProvider, "requestProvider", "Practitioner", "PractitionerRole", "Organization");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/EpisodeOfCare.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/EpisodeOfCare.java
index db2113e33fc..d6962b36a70 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/EpisodeOfCare.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/EpisodeOfCare.java
@@ -118,7 +118,6 @@ private EpisodeOfCare(Builder builder) {
         ValidationSupport.checkReferenceType(careManager, "careManager", "Practitioner", "PractitionerRole");
         ValidationSupport.checkReferenceType(team, "team", "CareTeam");
         ValidationSupport.checkReferenceType(account, "account", "Account");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/EventDefinition.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/EventDefinition.java
index ec590abf47b..85dae18a63e 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/EventDefinition.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/EventDefinition.java
@@ -186,7 +186,6 @@ private EventDefinition(Builder builder) {
         relatedArtifact = Collections.unmodifiableList(ValidationSupport.checkList(builder.relatedArtifact, "relatedArtifact", RelatedArtifact.class));
         trigger = Collections.unmodifiableList(ValidationSupport.checkNonEmptyList(builder.trigger, "trigger", TriggerDefinition.class));
         ValidationSupport.checkReferenceType(subject, "subject", "Group");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Evidence.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Evidence.java
index e1b628afeef..9b50c733df3 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Evidence.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Evidence.java
@@ -173,7 +173,6 @@ private Evidence(Builder builder) {
         ValidationSupport.checkReferenceType(exposureBackground, "exposureBackground", "EvidenceVariable");
         ValidationSupport.checkReferenceType(exposureVariant, "exposureVariant", "EvidenceVariable");
         ValidationSupport.checkReferenceType(outcome, "outcome", "EvidenceVariable");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/EvidenceVariable.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/EvidenceVariable.java
index e515961a83a..59c97d3ff5f 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/EvidenceVariable.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/EvidenceVariable.java
@@ -182,7 +182,6 @@ private EvidenceVariable(Builder builder) {
         relatedArtifact = Collections.unmodifiableList(ValidationSupport.checkList(builder.relatedArtifact, "relatedArtifact", RelatedArtifact.class));
         type = builder.type;
         characteristic = Collections.unmodifiableList(ValidationSupport.checkNonEmptyList(builder.characteristic, "characteristic", Characteristic.class));
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/ExampleScenario.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/ExampleScenario.java
index dfd7f2cb611..131bd8d1303 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/ExampleScenario.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/ExampleScenario.java
@@ -131,7 +131,6 @@ private ExampleScenario(Builder builder) {
         instance = Collections.unmodifiableList(ValidationSupport.checkList(builder.instance, "instance", Instance.class));
         process = Collections.unmodifiableList(ValidationSupport.checkList(builder.process, "process", Process.class));
         workflow = Collections.unmodifiableList(ValidationSupport.checkList(builder.workflow, "workflow", Canonical.class));
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/ExplanationOfBenefit.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/ExplanationOfBenefit.java
index fec9675d2fd..67986cfd7df 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/ExplanationOfBenefit.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/ExplanationOfBenefit.java
@@ -275,7 +275,6 @@ private ExplanationOfBenefit(Builder builder) {
         ValidationSupport.checkReferenceType(facility, "facility", "Location");
         ValidationSupport.checkReferenceType(claim, "claim", "Claim");
         ValidationSupport.checkReferenceType(claimResponse, "claimResponse", "ClaimResponse");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/FamilyMemberHistory.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/FamilyMemberHistory.java
index 48f89fb9ea4..2a77a258047 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/FamilyMemberHistory.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/FamilyMemberHistory.java
@@ -175,7 +175,6 @@ private FamilyMemberHistory(Builder builder) {
         condition = Collections.unmodifiableList(ValidationSupport.checkList(builder.condition, "condition", Condition.class));
         ValidationSupport.checkReferenceType(patient, "patient", "Patient");
         ValidationSupport.checkReferenceType(reasonReference, "reasonReference", "Condition", "Observation", "AllergyIntolerance", "QuestionnaireResponse", "DiagnosticReport", "DocumentReference");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Flag.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Flag.java
index 6c2f4039ae9..a7714ac1ae3 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Flag.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Flag.java
@@ -101,7 +101,6 @@ private Flag(Builder builder) {
         ValidationSupport.checkReferenceType(subject, "subject", "Patient", "Location", "Group", "Organization", "Practitioner", "PlanDefinition", "Medication", "Procedure");
         ValidationSupport.checkReferenceType(encounter, "encounter", "Encounter");
         ValidationSupport.checkReferenceType(author, "author", "Device", "Organization", "Patient", "Practitioner", "PractitionerRole");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Goal.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Goal.java
index 41a18d80078..cdd5b4f4be6 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Goal.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Goal.java
@@ -181,7 +181,6 @@ private Goal(Builder builder) {
         ValidationSupport.checkReferenceType(expressedBy, "expressedBy", "Patient", "Practitioner", "PractitionerRole", "RelatedPerson");
         ValidationSupport.checkReferenceType(addresses, "addresses", "Condition", "Observation", "MedicationStatement", "NutritionOrder", "ServiceRequest", "RiskAssessment");
         ValidationSupport.checkReferenceType(outcomeReference, "outcomeReference", "Observation");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/GraphDefinition.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/GraphDefinition.java
index 28a4575a52d..d2c248dfc25 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/GraphDefinition.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/GraphDefinition.java
@@ -138,7 +138,6 @@ private GraphDefinition(Builder builder) {
         start = ValidationSupport.requireNonNull(builder.start, "start");
         profile = builder.profile;
         link = Collections.unmodifiableList(ValidationSupport.checkList(builder.link, "link", Link.class));
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Group.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Group.java
index fb193aed30d..f0ebea79093 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Group.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Group.java
@@ -111,7 +111,6 @@ private Group(Builder builder) {
         characteristic = Collections.unmodifiableList(ValidationSupport.checkList(builder.characteristic, "characteristic", Characteristic.class));
         member = Collections.unmodifiableList(ValidationSupport.checkList(builder.member, "member", Member.class));
         ValidationSupport.checkReferenceType(managingEntity, "managingEntity", "Organization", "RelatedPerson", "Practitioner", "PractitionerRole");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/GuidanceResponse.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/GuidanceResponse.java
index e20df81f3dd..d0952f77cdc 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/GuidanceResponse.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/GuidanceResponse.java
@@ -113,7 +113,6 @@ private GuidanceResponse(Builder builder) {
         ValidationSupport.checkReferenceType(evaluationMessage, "evaluationMessage", "OperationOutcome");
         ValidationSupport.checkReferenceType(outputParameters, "outputParameters", "Parameters");
         ValidationSupport.checkReferenceType(result, "result", "CarePlan", "RequestGroup");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/HealthcareService.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/HealthcareService.java
index daa7f320cf6..82c78473330 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/HealthcareService.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/HealthcareService.java
@@ -189,7 +189,6 @@ private HealthcareService(Builder builder) {
         ValidationSupport.checkReferenceType(location, "location", "Location");
         ValidationSupport.checkReferenceType(coverageArea, "coverageArea", "Location");
         ValidationSupport.checkReferenceType(endpoint, "endpoint", "Endpoint");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/ImagingStudy.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/ImagingStudy.java
index c8d94e83338..1c839a0aa8b 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/ImagingStudy.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/ImagingStudy.java
@@ -204,7 +204,6 @@ private ImagingStudy(Builder builder) {
         ValidationSupport.checkReferenceType(procedureReference, "procedureReference", "Procedure");
         ValidationSupport.checkReferenceType(location, "location", "Location");
         ValidationSupport.checkReferenceType(reasonReference, "reasonReference", "Condition", "Observation", "Media", "DiagnosticReport", "DocumentReference");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Immunization.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Immunization.java
index e6d32b8fd42..9dde44cf15d 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Immunization.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Immunization.java
@@ -215,7 +215,6 @@ private Immunization(Builder builder) {
         ValidationSupport.checkReferenceType(location, "location", "Location");
         ValidationSupport.checkReferenceType(manufacturer, "manufacturer", "Organization");
         ValidationSupport.checkReferenceType(reasonReference, "reasonReference", "Condition", "Observation", "DiagnosticReport");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/ImmunizationEvaluation.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/ImmunizationEvaluation.java
index 37a8dbce3f2..56be54197b2 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/ImmunizationEvaluation.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/ImmunizationEvaluation.java
@@ -123,7 +123,6 @@ private ImmunizationEvaluation(Builder builder) {
         ValidationSupport.checkReferenceType(patient, "patient", "Patient");
         ValidationSupport.checkReferenceType(authority, "authority", "Organization");
         ValidationSupport.checkReferenceType(immunizationEvent, "immunizationEvent", "Immunization");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/ImmunizationRecommendation.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/ImmunizationRecommendation.java
index 55ef4ee8bb2..0dd14ebc014 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/ImmunizationRecommendation.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/ImmunizationRecommendation.java
@@ -84,7 +84,6 @@ private ImmunizationRecommendation(Builder builder) {
         recommendation = Collections.unmodifiableList(ValidationSupport.checkNonEmptyList(builder.recommendation, "recommendation", Recommendation.class));
         ValidationSupport.checkReferenceType(patient, "patient", "Patient");
         ValidationSupport.checkReferenceType(authority, "authority", "Organization");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/ImplementationGuide.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/ImplementationGuide.java
index a67f4ca4039..317248d8bbd 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/ImplementationGuide.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/ImplementationGuide.java
@@ -182,7 +182,6 @@ private ImplementationGuide(Builder builder) {
         global = Collections.unmodifiableList(ValidationSupport.checkList(builder.global, "global", Global.class));
         definition = builder.definition;
         manifest = builder.manifest;
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/InsurancePlan.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/InsurancePlan.java
index 636e31562de..5431bac16ca 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/InsurancePlan.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/InsurancePlan.java
@@ -131,7 +131,6 @@ private InsurancePlan(Builder builder) {
         ValidationSupport.checkReferenceType(coverageArea, "coverageArea", "Location");
         ValidationSupport.checkReferenceType(endpoint, "endpoint", "Endpoint");
         ValidationSupport.checkReferenceType(network, "network", "Organization");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Invoice.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Invoice.java
index 5c86275a74f..a6630372627 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Invoice.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Invoice.java
@@ -116,7 +116,6 @@ private Invoice(Builder builder) {
         ValidationSupport.checkReferenceType(recipient, "recipient", "Organization", "Patient", "RelatedPerson");
         ValidationSupport.checkReferenceType(issuer, "issuer", "Organization");
         ValidationSupport.checkReferenceType(account, "account", "Account");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Library.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Library.java
index d9a801d3515..4fda7608afa 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Library.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Library.java
@@ -210,7 +210,6 @@ private Library(Builder builder) {
         dataRequirement = Collections.unmodifiableList(ValidationSupport.checkList(builder.dataRequirement, "dataRequirement", DataRequirement.class));
         content = Collections.unmodifiableList(ValidationSupport.checkList(builder.content, "content", Attachment.class));
         ValidationSupport.checkReferenceType(subject, "subject", "Group");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Linkage.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Linkage.java
index fcb44a1b1c1..877b9a3e95b 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Linkage.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Linkage.java
@@ -69,7 +69,6 @@ private Linkage(Builder builder) {
         author = builder.author;
         item = Collections.unmodifiableList(ValidationSupport.checkNonEmptyList(builder.item, "item", Item.class));
         ValidationSupport.checkReferenceType(author, "author", "Practitioner", "PractitionerRole", "Organization");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/List.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/List.java
index 9bb2926d1da..32701c694b4 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/List.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/List.java
@@ -163,7 +163,6 @@ private List(Builder builder) {
         ValidationSupport.checkReferenceType(subject, "subject", "Patient", "Group", "Device", "Location");
         ValidationSupport.checkReferenceType(encounter, "encounter", "Encounter");
         ValidationSupport.checkReferenceType(source, "source", "Practitioner", "PractitionerRole", "Patient", "Device");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Location.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Location.java
index 347afe08fc4..2d6cce7d7ab 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Location.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Location.java
@@ -156,7 +156,6 @@ private Location(Builder builder) {
         ValidationSupport.checkReferenceType(managingOrganization, "managingOrganization", "Organization");
         ValidationSupport.checkReferenceType(partOf, "partOf", "Location");
         ValidationSupport.checkReferenceType(endpoint, "endpoint", "Endpoint");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Measure.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Measure.java
index a69aa091f71..39bea7f8462 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Measure.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Measure.java
@@ -294,7 +294,6 @@ private Measure(Builder builder) {
         supplementalData = Collections.unmodifiableList(ValidationSupport.checkList(builder.supplementalData, "supplementalData", SupplementalData.class));
         ValidationSupport.checkValueSetBinding(improvementNotation, "improvementNotation", "http://hl7.org/fhir/ValueSet/measure-improvement-notation", "http://terminology.hl7.org/CodeSystem/measure-improvement-notation", "increase", "decrease");
         ValidationSupport.checkReferenceType(subject, "subject", "Group");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/MeasureReport.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/MeasureReport.java
index cbfaecf7383..13fed2e5de1 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/MeasureReport.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/MeasureReport.java
@@ -146,7 +146,6 @@ private MeasureReport(Builder builder) {
         ValidationSupport.checkValueSetBinding(improvementNotation, "improvementNotation", "http://hl7.org/fhir/ValueSet/measure-improvement-notation", "http://terminology.hl7.org/CodeSystem/measure-improvement-notation", "increase", "decrease");
         ValidationSupport.checkReferenceType(subject, "subject", "Patient", "Practitioner", "PractitionerRole", "Location", "Device", "RelatedPerson", "Group");
         ValidationSupport.checkReferenceType(reporter, "reporter", "Practitioner", "PractitionerRole", "Location", "Organization");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Media.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Media.java
index fcb5e4833ce..9ba35f17bba 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Media.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Media.java
@@ -183,7 +183,6 @@ private Media(Builder builder) {
         ValidationSupport.checkReferenceType(encounter, "encounter", "Encounter");
         ValidationSupport.checkReferenceType(operator, "operator", "Practitioner", "PractitionerRole", "Organization", "CareTeam", "Patient", "Device", "RelatedPerson");
         ValidationSupport.checkReferenceType(device, "device", "Device", "DeviceMetric", "Device");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Medication.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Medication.java
index 04d7c7c0121..1b37568326c 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Medication.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Medication.java
@@ -98,7 +98,6 @@ private Medication(Builder builder) {
         ingredient = Collections.unmodifiableList(ValidationSupport.checkList(builder.ingredient, "ingredient", Ingredient.class));
         batch = builder.batch;
         ValidationSupport.checkReferenceType(manufacturer, "manufacturer", "Organization");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/MedicationAdministration.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/MedicationAdministration.java
index 154680b1b9f..a2571dbeb65 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/MedicationAdministration.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/MedicationAdministration.java
@@ -173,7 +173,6 @@ private MedicationAdministration(Builder builder) {
         ValidationSupport.checkReferenceType(request, "request", "MedicationRequest");
         ValidationSupport.checkReferenceType(device, "device", "Device");
         ValidationSupport.checkReferenceType(eventHistory, "eventHistory", "Provenance");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/MedicationDispense.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/MedicationDispense.java
index 32f83ab822c..50d7ed6ee92 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/MedicationDispense.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/MedicationDispense.java
@@ -183,7 +183,6 @@ private MedicationDispense(Builder builder) {
         ValidationSupport.checkReferenceType(receiver, "receiver", "Patient", "Practitioner");
         ValidationSupport.checkReferenceType(detectedIssue, "detectedIssue", "DetectedIssue");
         ValidationSupport.checkReferenceType(eventHistory, "eventHistory", "Provenance");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/MedicationKnowledge.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/MedicationKnowledge.java
index ce5c2be45d3..b7027f8de77 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/MedicationKnowledge.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/MedicationKnowledge.java
@@ -138,7 +138,6 @@ private MedicationKnowledge(Builder builder) {
         ValidationSupport.checkReferenceType(manufacturer, "manufacturer", "Organization");
         ValidationSupport.checkReferenceType(associatedMedication, "associatedMedication", "Medication");
         ValidationSupport.checkReferenceType(contraindication, "contraindication", "DetectedIssue");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/MedicationRequest.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/MedicationRequest.java
index 9abfb5065f6..b73282e27fa 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/MedicationRequest.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/MedicationRequest.java
@@ -230,7 +230,6 @@ private MedicationRequest(Builder builder) {
         ValidationSupport.checkReferenceType(priorPrescription, "priorPrescription", "MedicationRequest");
         ValidationSupport.checkReferenceType(detectedIssue, "detectedIssue", "DetectedIssue");
         ValidationSupport.checkReferenceType(eventHistory, "eventHistory", "Provenance");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/MedicationStatement.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/MedicationStatement.java
index d8e78864f54..a34bced417b 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/MedicationStatement.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/MedicationStatement.java
@@ -171,7 +171,6 @@ private MedicationStatement(Builder builder) {
         ValidationSupport.checkReferenceType(context, "context", "Encounter", "EpisodeOfCare");
         ValidationSupport.checkReferenceType(informationSource, "informationSource", "Patient", "Practitioner", "PractitionerRole", "RelatedPerson", "Organization");
         ValidationSupport.checkReferenceType(reasonReference, "reasonReference", "Condition", "Observation", "DiagnosticReport");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/MedicinalProduct.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/MedicinalProduct.java
index 80594e4df43..2f6a05fdcd0 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/MedicinalProduct.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/MedicinalProduct.java
@@ -126,7 +126,6 @@ private MedicinalProduct(Builder builder) {
         ValidationSupport.checkReferenceType(masterFile, "masterFile", "DocumentReference");
         ValidationSupport.checkReferenceType(contact, "contact", "Organization", "PractitionerRole");
         ValidationSupport.checkReferenceType(clinicalTrial, "clinicalTrial", "ResearchStudy");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/MedicinalProductAuthorization.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/MedicinalProductAuthorization.java
index 7b28ec651a7..cf8c061e48a 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/MedicinalProductAuthorization.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/MedicinalProductAuthorization.java
@@ -105,7 +105,6 @@ private MedicinalProductAuthorization(Builder builder) {
         ValidationSupport.checkReferenceType(subject, "subject", "MedicinalProduct", "MedicinalProductPackaged");
         ValidationSupport.checkReferenceType(holder, "holder", "Organization");
         ValidationSupport.checkReferenceType(regulator, "regulator", "Organization");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/MedicinalProductContraindication.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/MedicinalProductContraindication.java
index 8a6802722f3..c57715c0bb4 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/MedicinalProductContraindication.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/MedicinalProductContraindication.java
@@ -75,7 +75,6 @@ private MedicinalProductContraindication(Builder builder) {
         population = Collections.unmodifiableList(ValidationSupport.checkList(builder.population, "population", Population.class));
         ValidationSupport.checkReferenceType(subject, "subject", "MedicinalProduct", "Medication");
         ValidationSupport.checkReferenceType(therapeuticIndication, "therapeuticIndication", "MedicinalProductIndication");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/MedicinalProductIndication.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/MedicinalProductIndication.java
index 8c2594b8362..1e1c0cf4e5b 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/MedicinalProductIndication.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/MedicinalProductIndication.java
@@ -81,7 +81,6 @@ private MedicinalProductIndication(Builder builder) {
         population = Collections.unmodifiableList(ValidationSupport.checkList(builder.population, "population", Population.class));
         ValidationSupport.checkReferenceType(subject, "subject", "MedicinalProduct", "Medication");
         ValidationSupport.checkReferenceType(undesirableEffect, "undesirableEffect", "MedicinalProductUndesirableEffect");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/MedicinalProductIngredient.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/MedicinalProductIngredient.java
index 49b1a6b60ef..72bf2459f2d 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/MedicinalProductIngredient.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/MedicinalProductIngredient.java
@@ -71,7 +71,6 @@ private MedicinalProductIngredient(Builder builder) {
         specifiedSubstance = Collections.unmodifiableList(ValidationSupport.checkList(builder.specifiedSubstance, "specifiedSubstance", SpecifiedSubstance.class));
         substance = builder.substance;
         ValidationSupport.checkReferenceType(manufacturer, "manufacturer", "Organization");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/MedicinalProductInteraction.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/MedicinalProductInteraction.java
index c9c10711342..907e18085ff 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/MedicinalProductInteraction.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/MedicinalProductInteraction.java
@@ -72,7 +72,6 @@ private MedicinalProductInteraction(Builder builder) {
         incidence = builder.incidence;
         management = builder.management;
         ValidationSupport.checkReferenceType(subject, "subject", "MedicinalProduct", "Medication", "Substance");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/MedicinalProductManufactured.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/MedicinalProductManufactured.java
index bcc4f0068f2..578027d2f8c 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/MedicinalProductManufactured.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/MedicinalProductManufactured.java
@@ -74,7 +74,6 @@ private MedicinalProductManufactured(Builder builder) {
         otherCharacteristics = Collections.unmodifiableList(ValidationSupport.checkList(builder.otherCharacteristics, "otherCharacteristics", CodeableConcept.class));
         ValidationSupport.checkReferenceType(manufacturer, "manufacturer", "Organization");
         ValidationSupport.checkReferenceType(ingredient, "ingredient", "MedicinalProductIngredient");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/MedicinalProductPackaged.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/MedicinalProductPackaged.java
index 2bd1af55c6d..b9bbd585f5f 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/MedicinalProductPackaged.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/MedicinalProductPackaged.java
@@ -86,7 +86,6 @@ private MedicinalProductPackaged(Builder builder) {
         ValidationSupport.checkReferenceType(subject, "subject", "MedicinalProduct");
         ValidationSupport.checkReferenceType(marketingAuthorization, "marketingAuthorization", "MedicinalProductAuthorization");
         ValidationSupport.checkReferenceType(manufacturer, "manufacturer", "Organization");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/MedicinalProductPharmaceutical.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/MedicinalProductPharmaceutical.java
index 1a6da908c6d..0d43e7fd712 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/MedicinalProductPharmaceutical.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/MedicinalProductPharmaceutical.java
@@ -78,7 +78,6 @@ private MedicinalProductPharmaceutical(Builder builder) {
         routeOfAdministration = Collections.unmodifiableList(ValidationSupport.checkNonEmptyList(builder.routeOfAdministration, "routeOfAdministration", RouteOfAdministration.class));
         ValidationSupport.checkReferenceType(ingredient, "ingredient", "MedicinalProductIngredient");
         ValidationSupport.checkReferenceType(device, "device", "DeviceDefinition");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/MedicinalProductUndesirableEffect.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/MedicinalProductUndesirableEffect.java
index df0b9a37d5c..31703262ac4 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/MedicinalProductUndesirableEffect.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/MedicinalProductUndesirableEffect.java
@@ -62,7 +62,6 @@ private MedicinalProductUndesirableEffect(Builder builder) {
         frequencyOfOccurrence = builder.frequencyOfOccurrence;
         population = Collections.unmodifiableList(ValidationSupport.checkList(builder.population, "population", Population.class));
         ValidationSupport.checkReferenceType(subject, "subject", "MedicinalProduct", "Medication");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/MessageDefinition.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/MessageDefinition.java
index 9d992340b36..51007d72cbf 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/MessageDefinition.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/MessageDefinition.java
@@ -188,7 +188,6 @@ private MessageDefinition(Builder builder) {
         responseRequired = builder.responseRequired;
         allowedResponse = Collections.unmodifiableList(ValidationSupport.checkList(builder.allowedResponse, "allowedResponse", AllowedResponse.class));
         graph = Collections.unmodifiableList(ValidationSupport.checkList(builder.graph, "graph", Canonical.class));
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/MessageHeader.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/MessageHeader.java
index 4c33612f047..3a5bcf309e3 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/MessageHeader.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/MessageHeader.java
@@ -115,7 +115,6 @@ private MessageHeader(Builder builder) {
         ValidationSupport.checkReferenceType(enterer, "enterer", "Practitioner", "PractitionerRole");
         ValidationSupport.checkReferenceType(author, "author", "Practitioner", "PractitionerRole");
         ValidationSupport.checkReferenceType(responsible, "responsible", "Practitioner", "PractitionerRole", "Organization");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/MolecularSequence.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/MolecularSequence.java
index 1e942da1f26..f1ff94bc9ce 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/MolecularSequence.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/MolecularSequence.java
@@ -146,7 +146,6 @@ private MolecularSequence(Builder builder) {
         ValidationSupport.checkReferenceType(device, "device", "Device");
         ValidationSupport.checkReferenceType(performer, "performer", "Organization");
         ValidationSupport.checkReferenceType(pointer, "pointer", "MolecularSequence");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/NamingSystem.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/NamingSystem.java
index c9106b7d274..6ead4d28aad 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/NamingSystem.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/NamingSystem.java
@@ -159,7 +159,6 @@ private NamingSystem(Builder builder) {
         jurisdiction = Collections.unmodifiableList(ValidationSupport.checkList(builder.jurisdiction, "jurisdiction", CodeableConcept.class));
         usage = builder.usage;
         uniqueId = Collections.unmodifiableList(ValidationSupport.checkNonEmptyList(builder.uniqueId, "uniqueId", UniqueId.class));
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/NutritionOrder.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/NutritionOrder.java
index 69b2adb0859..2150fba6b00 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/NutritionOrder.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/NutritionOrder.java
@@ -153,7 +153,6 @@ private NutritionOrder(Builder builder) {
         ValidationSupport.checkReferenceType(encounter, "encounter", "Encounter");
         ValidationSupport.checkReferenceType(orderer, "orderer", "Practitioner", "PractitionerRole");
         ValidationSupport.checkReferenceType(allergyIntolerance, "allergyIntolerance", "AllergyIntolerance");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Observation.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Observation.java
index 7f7252c92dc..2487f2d1450 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Observation.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Observation.java
@@ -263,7 +263,6 @@ private Observation(Builder builder) {
         ValidationSupport.checkReferenceType(device, "device", "Device", "DeviceMetric");
         ValidationSupport.checkReferenceType(hasMember, "hasMember", "Observation", "QuestionnaireResponse", "MolecularSequence");
         ValidationSupport.checkReferenceType(derivedFrom, "derivedFrom", "DocumentReference", "ImagingStudy", "Media", "QuestionnaireResponse", "Observation", "MolecularSequence");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/ObservationDefinition.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/ObservationDefinition.java
index 61d2000ce41..1382ead36b5 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/ObservationDefinition.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/ObservationDefinition.java
@@ -145,7 +145,6 @@ private ObservationDefinition(Builder builder) {
         ValidationSupport.checkReferenceType(normalCodedValueSet, "normalCodedValueSet", "ValueSet");
         ValidationSupport.checkReferenceType(abnormalCodedValueSet, "abnormalCodedValueSet", "ValueSet");
         ValidationSupport.checkReferenceType(criticalCodedValueSet, "criticalCodedValueSet", "ValueSet");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/OperationDefinition.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/OperationDefinition.java
index 6df06bd9110..13c056b1733 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/OperationDefinition.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/OperationDefinition.java
@@ -200,7 +200,6 @@ private OperationDefinition(Builder builder) {
         outputProfile = builder.outputProfile;
         parameter = Collections.unmodifiableList(ValidationSupport.checkList(builder.parameter, "parameter", Parameter.class));
         overload = Collections.unmodifiableList(ValidationSupport.checkList(builder.overload, "overload", Overload.class));
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/OperationOutcome.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/OperationOutcome.java
index fe8b4ddd204..efc85c48f49 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/OperationOutcome.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/OperationOutcome.java
@@ -53,7 +53,6 @@ public class OperationOutcome extends DomainResource {
     private OperationOutcome(Builder builder) {
         super(builder);
         issue = Collections.unmodifiableList(ValidationSupport.checkNonEmptyList(builder.issue, "issue", Issue.class));
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Organization.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Organization.java
index 87f834ee59c..6e3f9ed41d5 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Organization.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Organization.java
@@ -120,7 +120,6 @@ private Organization(Builder builder) {
         endpoint = Collections.unmodifiableList(ValidationSupport.checkList(builder.endpoint, "endpoint", Reference.class));
         ValidationSupport.checkReferenceType(partOf, "partOf", "Organization");
         ValidationSupport.checkReferenceType(endpoint, "endpoint", "Endpoint");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/OrganizationAffiliation.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/OrganizationAffiliation.java
index 1f2f9d2e148..9311d25515a 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/OrganizationAffiliation.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/OrganizationAffiliation.java
@@ -118,7 +118,6 @@ private OrganizationAffiliation(Builder builder) {
         ValidationSupport.checkReferenceType(location, "location", "Location");
         ValidationSupport.checkReferenceType(healthcareService, "healthcareService", "HealthcareService");
         ValidationSupport.checkReferenceType(endpoint, "endpoint", "Endpoint");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Parameters.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Parameters.java
index 36df22d1445..6907557600b 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Parameters.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Parameters.java
@@ -103,7 +103,6 @@ public class Parameters extends Resource {
     private Parameters(Builder builder) {
         super(builder);
         parameter = Collections.unmodifiableList(ValidationSupport.checkList(builder.parameter, "parameter", Parameter.class));
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Patient.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Patient.java
index 2c4b2f06c32..58f8da09944 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Patient.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Patient.java
@@ -155,7 +155,6 @@ private Patient(Builder builder) {
         link = Collections.unmodifiableList(ValidationSupport.checkList(builder.link, "link", Link.class));
         ValidationSupport.checkReferenceType(generalPractitioner, "generalPractitioner", "Organization", "Practitioner", "PractitionerRole");
         ValidationSupport.checkReferenceType(managingOrganization, "managingOrganization", "Organization");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/PaymentNotice.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/PaymentNotice.java
index a89cc952cf1..9a29dffdc45 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/PaymentNotice.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/PaymentNotice.java
@@ -107,7 +107,6 @@ private PaymentNotice(Builder builder) {
         ValidationSupport.checkReferenceType(payment, "payment", "PaymentReconciliation");
         ValidationSupport.checkReferenceType(payee, "payee", "Practitioner", "PractitionerRole", "Organization");
         ValidationSupport.checkReferenceType(recipient, "recipient", "Organization");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/PaymentReconciliation.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/PaymentReconciliation.java
index f9bdc545833..c78c5d4d046 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/PaymentReconciliation.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/PaymentReconciliation.java
@@ -121,7 +121,6 @@ private PaymentReconciliation(Builder builder) {
         ValidationSupport.checkReferenceType(paymentIssuer, "paymentIssuer", "Organization");
         ValidationSupport.checkReferenceType(request, "request", "Task");
         ValidationSupport.checkReferenceType(requestor, "requestor", "Practitioner", "PractitionerRole", "Organization");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Person.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Person.java
index 9c120acfd6c..54a75c9745c 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Person.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Person.java
@@ -90,7 +90,6 @@ private Person(Builder builder) {
         active = builder.active;
         link = Collections.unmodifiableList(ValidationSupport.checkList(builder.link, "link", Link.class));
         ValidationSupport.checkReferenceType(managingOrganization, "managingOrganization", "Organization");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/PlanDefinition.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/PlanDefinition.java
index 00c910067c0..91ef0cb804d 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/PlanDefinition.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/PlanDefinition.java
@@ -249,7 +249,6 @@ private PlanDefinition(Builder builder) {
         goal = Collections.unmodifiableList(ValidationSupport.checkList(builder.goal, "goal", Goal.class));
         action = Collections.unmodifiableList(ValidationSupport.checkList(builder.action, "action", Action.class));
         ValidationSupport.checkReferenceType(subject, "subject", "Group");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Practitioner.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Practitioner.java
index 77724174563..459a6125b91 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Practitioner.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Practitioner.java
@@ -107,7 +107,6 @@ private Practitioner(Builder builder) {
         qualification = Collections.unmodifiableList(ValidationSupport.checkList(builder.qualification, "qualification", Qualification.class));
         communication = Collections.unmodifiableList(ValidationSupport.checkList(builder.communication, "communication", CodeableConcept.class));
         ValidationSupport.checkValueSetBinding(communication, "communication", "http://hl7.org/fhir/ValueSet/all-languages", "urn:ietf:bcp:47");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/PractitionerRole.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/PractitionerRole.java
index 688d1c2d334..2b709db3841 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/PractitionerRole.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/PractitionerRole.java
@@ -124,7 +124,6 @@ private PractitionerRole(Builder builder) {
         ValidationSupport.checkReferenceType(location, "location", "Location");
         ValidationSupport.checkReferenceType(healthcareService, "healthcareService", "HealthcareService");
         ValidationSupport.checkReferenceType(endpoint, "endpoint", "Endpoint");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Procedure.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Procedure.java
index fe2ca197362..e7c5603e435 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Procedure.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Procedure.java
@@ -230,7 +230,6 @@ private Procedure(Builder builder) {
         ValidationSupport.checkReferenceType(report, "report", "DiagnosticReport", "DocumentReference", "Composition");
         ValidationSupport.checkReferenceType(complicationDetail, "complicationDetail", "Condition");
         ValidationSupport.checkReferenceType(usedReference, "usedReference", "Device", "Medication", "Substance");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Provenance.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Provenance.java
index 38a09102b0a..e0254045041 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Provenance.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Provenance.java
@@ -126,7 +126,6 @@ private Provenance(Builder builder) {
         entity = Collections.unmodifiableList(ValidationSupport.checkList(builder.entity, "entity", Entity.class));
         signature = Collections.unmodifiableList(ValidationSupport.checkList(builder.signature, "signature", Signature.class));
         ValidationSupport.checkReferenceType(location, "location", "Location");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Questionnaire.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Questionnaire.java
index a362daad4b4..a3f7b79393d 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Questionnaire.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Questionnaire.java
@@ -262,7 +262,6 @@ private Questionnaire(Builder builder) {
         effectivePeriod = builder.effectivePeriod;
         code = Collections.unmodifiableList(ValidationSupport.checkList(builder.code, "code", Coding.class));
         item = Collections.unmodifiableList(ValidationSupport.checkList(builder.item, "item", Item.class));
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/QuestionnaireResponse.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/QuestionnaireResponse.java
index 21646ea1505..f9cb8616d6d 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/QuestionnaireResponse.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/QuestionnaireResponse.java
@@ -120,7 +120,6 @@ private QuestionnaireResponse(Builder builder) {
         ValidationSupport.checkReferenceType(encounter, "encounter", "Encounter");
         ValidationSupport.checkReferenceType(author, "author", "Device", "Practitioner", "PractitionerRole", "Patient", "RelatedPerson", "Organization");
         ValidationSupport.checkReferenceType(source, "source", "Patient", "Practitioner", "PractitionerRole", "RelatedPerson");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/RelatedPerson.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/RelatedPerson.java
index a6ddfecba15..d4617863f51 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/RelatedPerson.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/RelatedPerson.java
@@ -123,7 +123,6 @@ private RelatedPerson(Builder builder) {
         period = builder.period;
         communication = Collections.unmodifiableList(ValidationSupport.checkList(builder.communication, "communication", Communication.class));
         ValidationSupport.checkReferenceType(patient, "patient", "Patient");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/RequestGroup.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/RequestGroup.java
index ad25a2358e9..7582d7ef771 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/RequestGroup.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/RequestGroup.java
@@ -162,7 +162,6 @@ private RequestGroup(Builder builder) {
         ValidationSupport.checkReferenceType(encounter, "encounter", "Encounter");
         ValidationSupport.checkReferenceType(author, "author", "Device", "Practitioner", "PractitionerRole");
         ValidationSupport.checkReferenceType(reasonReference, "reasonReference", "Condition", "Observation", "DiagnosticReport", "DocumentReference");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/ResearchDefinition.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/ResearchDefinition.java
index 8fbbbf5faaf..19b72e38c53 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/ResearchDefinition.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/ResearchDefinition.java
@@ -209,7 +209,6 @@ private ResearchDefinition(Builder builder) {
         ValidationSupport.checkReferenceType(exposure, "exposure", "ResearchElementDefinition");
         ValidationSupport.checkReferenceType(exposureAlternative, "exposureAlternative", "ResearchElementDefinition");
         ValidationSupport.checkReferenceType(outcome, "outcome", "ResearchElementDefinition");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/ResearchElementDefinition.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/ResearchElementDefinition.java
index 43f18833931..d2ef71b11cc 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/ResearchElementDefinition.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/ResearchElementDefinition.java
@@ -219,7 +219,6 @@ private ResearchElementDefinition(Builder builder) {
         variableType = builder.variableType;
         characteristic = Collections.unmodifiableList(ValidationSupport.checkNonEmptyList(builder.characteristic, "characteristic", Characteristic.class));
         ValidationSupport.checkReferenceType(subject, "subject", "Group");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/ResearchStudy.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/ResearchStudy.java
index 95ad5f1dd33..ebf00ca9e7e 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/ResearchStudy.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/ResearchStudy.java
@@ -215,7 +215,6 @@ private ResearchStudy(Builder builder) {
         ValidationSupport.checkReferenceType(sponsor, "sponsor", "Organization");
         ValidationSupport.checkReferenceType(principalInvestigator, "principalInvestigator", "Practitioner", "PractitionerRole");
         ValidationSupport.checkReferenceType(site, "site", "Location");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/ResearchSubject.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/ResearchSubject.java
index 2ac2723a345..c81e1547c85 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/ResearchSubject.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/ResearchSubject.java
@@ -86,7 +86,6 @@ private ResearchSubject(Builder builder) {
         ValidationSupport.checkReferenceType(study, "study", "ResearchStudy");
         ValidationSupport.checkReferenceType(individual, "individual", "Patient");
         ValidationSupport.checkReferenceType(consent, "consent", "Consent");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/RiskAssessment.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/RiskAssessment.java
index e5113f03a9c..85af0b5a324 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/RiskAssessment.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/RiskAssessment.java
@@ -140,7 +140,6 @@ private RiskAssessment(Builder builder) {
         ValidationSupport.checkReferenceType(condition, "condition", "Condition");
         ValidationSupport.checkReferenceType(performer, "performer", "Practitioner", "PractitionerRole", "Device");
         ValidationSupport.checkReferenceType(reasonReference, "reasonReference", "Condition", "Observation", "DiagnosticReport", "DocumentReference");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/RiskEvidenceSynthesis.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/RiskEvidenceSynthesis.java
index 43a157d9a35..7ca5ea1c759 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/RiskEvidenceSynthesis.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/RiskEvidenceSynthesis.java
@@ -252,7 +252,6 @@ private RiskEvidenceSynthesis(Builder builder) {
         ValidationSupport.checkReferenceType(population, "population", "EvidenceVariable");
         ValidationSupport.checkReferenceType(exposure, "exposure", "EvidenceVariable");
         ValidationSupport.checkReferenceType(outcome, "outcome", "EvidenceVariable");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Schedule.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Schedule.java
index c164515f59c..509509528d9 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Schedule.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Schedule.java
@@ -102,7 +102,6 @@ private Schedule(Builder builder) {
         planningHorizon = builder.planningHorizon;
         comment = builder.comment;
         ValidationSupport.checkReferenceType(actor, "actor", "Patient", "Practitioner", "PractitionerRole", "RelatedPerson", "Device", "HealthcareService", "Location");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/SearchParameter.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/SearchParameter.java
index f691715444b..405e7b70577 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/SearchParameter.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/SearchParameter.java
@@ -210,7 +210,6 @@ private SearchParameter(Builder builder) {
         modifier = Collections.unmodifiableList(ValidationSupport.checkList(builder.modifier, "modifier", SearchModifierCode.class));
         chain = Collections.unmodifiableList(ValidationSupport.checkList(builder.chain, "chain", String.class));
         component = Collections.unmodifiableList(ValidationSupport.checkList(builder.component, "component", Component.class));
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/ServiceRequest.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/ServiceRequest.java
index 059a8fc7d94..ba4610235d3 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/ServiceRequest.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/ServiceRequest.java
@@ -260,7 +260,6 @@ private ServiceRequest(Builder builder) {
         ValidationSupport.checkReferenceType(insurance, "insurance", "Coverage", "ClaimResponse");
         ValidationSupport.checkReferenceType(specimen, "specimen", "Specimen");
         ValidationSupport.checkReferenceType(relevantHistory, "relevantHistory", "Provenance");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Slot.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Slot.java
index ac0822d1a84..28d450ddd78 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Slot.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Slot.java
@@ -133,7 +133,6 @@ private Slot(Builder builder) {
         overbooked = builder.overbooked;
         comment = builder.comment;
         ValidationSupport.checkReferenceType(schedule, "schedule", "Schedule");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Specimen.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Specimen.java
index 8dd6ec447f3..9cfc479b07e 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Specimen.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Specimen.java
@@ -130,7 +130,6 @@ private Specimen(Builder builder) {
         ValidationSupport.checkReferenceType(subject, "subject", "Patient", "Group", "Device", "Substance", "Location");
         ValidationSupport.checkReferenceType(parent, "parent", "Specimen");
         ValidationSupport.checkReferenceType(request, "request", "ServiceRequest");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/SpecimenDefinition.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/SpecimenDefinition.java
index c190cbc30fc..4dc829d400a 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/SpecimenDefinition.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/SpecimenDefinition.java
@@ -92,7 +92,6 @@ private SpecimenDefinition(Builder builder) {
         timeAspect = builder.timeAspect;
         collection = Collections.unmodifiableList(ValidationSupport.checkList(builder.collection, "collection", CodeableConcept.class));
         typeTested = Collections.unmodifiableList(ValidationSupport.checkList(builder.typeTested, "typeTested", TypeTested.class));
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/StructureDefinition.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/StructureDefinition.java
index beb76f5d01c..f585387ac4e 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/StructureDefinition.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/StructureDefinition.java
@@ -379,7 +379,6 @@ private StructureDefinition(Builder builder) {
         derivation = builder.derivation;
         snapshot = builder.snapshot;
         differential = builder.differential;
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/StructureMap.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/StructureMap.java
index eed5a722ad7..64ed2898959 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/StructureMap.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/StructureMap.java
@@ -199,7 +199,6 @@ private StructureMap(Builder builder) {
         structure = Collections.unmodifiableList(ValidationSupport.checkList(builder.structure, "structure", Structure.class));
         _import = Collections.unmodifiableList(ValidationSupport.checkList(builder._import, "import", Canonical.class));
         group = Collections.unmodifiableList(ValidationSupport.checkNonEmptyList(builder.group, "group", Group.class));
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Subscription.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Subscription.java
index 76ea71eb3fb..1f262e980ae 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Subscription.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Subscription.java
@@ -85,7 +85,6 @@ private Subscription(Builder builder) {
         criteria = ValidationSupport.requireNonNull(builder.criteria, "criteria");
         error = builder.error;
         channel = ValidationSupport.requireNonNull(builder.channel, "channel");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Substance.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Substance.java
index dc7b247f16d..308b4517746 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Substance.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Substance.java
@@ -105,7 +105,6 @@ private Substance(Builder builder) {
         description = builder.description;
         instance = Collections.unmodifiableList(ValidationSupport.checkList(builder.instance, "instance", Instance.class));
         ingredient = Collections.unmodifiableList(ValidationSupport.checkList(builder.ingredient, "ingredient", Ingredient.class));
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/SubstanceNucleicAcid.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/SubstanceNucleicAcid.java
index 8fb2adec8b6..f7893a01500 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/SubstanceNucleicAcid.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/SubstanceNucleicAcid.java
@@ -63,7 +63,6 @@ private SubstanceNucleicAcid(Builder builder) {
         areaOfHybridisation = builder.areaOfHybridisation;
         oligoNucleotideType = builder.oligoNucleotideType;
         subunit = Collections.unmodifiableList(ValidationSupport.checkList(builder.subunit, "subunit", Subunit.class));
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/SubstancePolymer.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/SubstancePolymer.java
index 85dd94eaa4d..b5b85c3107d 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/SubstancePolymer.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/SubstancePolymer.java
@@ -66,7 +66,6 @@ private SubstancePolymer(Builder builder) {
         modification = Collections.unmodifiableList(ValidationSupport.checkList(builder.modification, "modification", String.class));
         monomerSet = Collections.unmodifiableList(ValidationSupport.checkList(builder.monomerSet, "monomerSet", MonomerSet.class));
         repeat = Collections.unmodifiableList(ValidationSupport.checkList(builder.repeat, "repeat", Repeat.class));
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/SubstanceProtein.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/SubstanceProtein.java
index 2dd5c870591..1dcde0ff123 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/SubstanceProtein.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/SubstanceProtein.java
@@ -63,7 +63,6 @@ private SubstanceProtein(Builder builder) {
         numberOfSubunits = builder.numberOfSubunits;
         disulfideLinkage = Collections.unmodifiableList(ValidationSupport.checkList(builder.disulfideLinkage, "disulfideLinkage", String.class));
         subunit = Collections.unmodifiableList(ValidationSupport.checkList(builder.subunit, "subunit", Subunit.class));
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/SubstanceReferenceInformation.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/SubstanceReferenceInformation.java
index ab8c9951533..85ed0a9cb7e 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/SubstanceReferenceInformation.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/SubstanceReferenceInformation.java
@@ -66,7 +66,6 @@ private SubstanceReferenceInformation(Builder builder) {
         geneElement = Collections.unmodifiableList(ValidationSupport.checkList(builder.geneElement, "geneElement", GeneElement.class));
         classification = Collections.unmodifiableList(ValidationSupport.checkList(builder.classification, "classification", Classification.class));
         target = Collections.unmodifiableList(ValidationSupport.checkList(builder.target, "target", Target.class));
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/SubstanceSourceMaterial.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/SubstanceSourceMaterial.java
index 4cc442bff92..aea0bb48b4d 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/SubstanceSourceMaterial.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/SubstanceSourceMaterial.java
@@ -92,7 +92,6 @@ private SubstanceSourceMaterial(Builder builder) {
         fractionDescription = Collections.unmodifiableList(ValidationSupport.checkList(builder.fractionDescription, "fractionDescription", FractionDescription.class));
         organism = builder.organism;
         partDescription = Collections.unmodifiableList(ValidationSupport.checkList(builder.partDescription, "partDescription", PartDescription.class));
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/SubstanceSpecification.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/SubstanceSpecification.java
index cf83033c467..a5ff64a6e31 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/SubstanceSpecification.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/SubstanceSpecification.java
@@ -124,7 +124,6 @@ private SubstanceSpecification(Builder builder) {
         ValidationSupport.checkReferenceType(polymer, "polymer", "SubstancePolymer");
         ValidationSupport.checkReferenceType(protein, "protein", "SubstanceProtein");
         ValidationSupport.checkReferenceType(sourceMaterial, "sourceMaterial", "SubstanceSourceMaterial");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/SupplyDelivery.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/SupplyDelivery.java
index 3f5450aed1f..d0c3b108ea4 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/SupplyDelivery.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/SupplyDelivery.java
@@ -107,7 +107,6 @@ private SupplyDelivery(Builder builder) {
         ValidationSupport.checkReferenceType(supplier, "supplier", "Practitioner", "PractitionerRole", "Organization");
         ValidationSupport.checkReferenceType(destination, "destination", "Location");
         ValidationSupport.checkReferenceType(receiver, "receiver", "Practitioner", "PractitionerRole");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/SupplyRequest.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/SupplyRequest.java
index bbecb87dd92..0568e3eccd1 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/SupplyRequest.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/SupplyRequest.java
@@ -145,7 +145,6 @@ private SupplyRequest(Builder builder) {
         ValidationSupport.checkReferenceType(reasonReference, "reasonReference", "Condition", "Observation", "DiagnosticReport", "DocumentReference");
         ValidationSupport.checkReferenceType(deliverFrom, "deliverFrom", "Organization", "Location");
         ValidationSupport.checkReferenceType(deliverTo, "deliverTo", "Organization", "Location", "Patient");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Task.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Task.java
index 330924d4400..f13e155f86b 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Task.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Task.java
@@ -256,7 +256,6 @@ private Task(Builder builder) {
         ValidationSupport.checkReferenceType(location, "location", "Location");
         ValidationSupport.checkReferenceType(insurance, "insurance", "Coverage", "ClaimResponse");
         ValidationSupport.checkReferenceType(relevantHistory, "relevantHistory", "Provenance");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/TerminologyCapabilities.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/TerminologyCapabilities.java
index 48fa15af0fb..a28c7c90d15 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/TerminologyCapabilities.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/TerminologyCapabilities.java
@@ -200,7 +200,6 @@ private TerminologyCapabilities(Builder builder) {
         validateCode = builder.validateCode;
         translation = builder.translation;
         closure = builder.closure;
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/TestReport.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/TestReport.java
index fc16fdbc00c..5cb7d8c6b0f 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/TestReport.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/TestReport.java
@@ -120,7 +120,6 @@ private TestReport(Builder builder) {
         test = Collections.unmodifiableList(ValidationSupport.checkList(builder.test, "test", Test.class));
         teardown = builder.teardown;
         ValidationSupport.checkReferenceType(testScript, "testScript", "TestScript");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/TestScript.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/TestScript.java
index 1db3b64a039..d66d10ab4cc 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/TestScript.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/TestScript.java
@@ -271,7 +271,6 @@ private TestScript(Builder builder) {
         setup = builder.setup;
         test = Collections.unmodifiableList(ValidationSupport.checkList(builder.test, "test", Test.class));
         teardown = builder.teardown;
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/ValueSet.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/ValueSet.java
index cfce02357c8..eabb7c93b37 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/ValueSet.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/ValueSet.java
@@ -200,7 +200,6 @@ private ValueSet(Builder builder) {
         copyright = builder.copyright;
         compose = builder.compose;
         expansion = builder.expansion;
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/VerificationResult.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/VerificationResult.java
index 1340ea4b4ae..fd7d3b2ed0d 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/VerificationResult.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/VerificationResult.java
@@ -170,7 +170,6 @@ private VerificationResult(Builder builder) {
         primarySource = Collections.unmodifiableList(ValidationSupport.checkList(builder.primarySource, "primarySource", PrimarySource.class));
         attestation = builder.attestation;
         validator = Collections.unmodifiableList(ValidationSupport.checkList(builder.validator, "validator", Validator.class));
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/VisionPrescription.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/VisionPrescription.java
index 1798d30009a..948ddbcf462 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/resource/VisionPrescription.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/resource/VisionPrescription.java
@@ -98,7 +98,6 @@ private VisionPrescription(Builder builder) {
         ValidationSupport.checkReferenceType(patient, "patient", "Patient");
         ValidationSupport.checkReferenceType(encounter, "encounter", "Encounter");
         ValidationSupport.checkReferenceType(prescriber, "prescriber", "Practitioner", "PractitionerRole");
-        ValidationSupport.requireChildren(this);
     }
 
     /**
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/util/ValidationSupport.java b/fhir-model/src/main/java/com/ibm/fhir/model/util/ValidationSupport.java
index 695ce025eb4..bde79a71baf 100644
--- a/fhir-model/src/main/java/com/ibm/fhir/model/util/ValidationSupport.java
+++ b/fhir-model/src/main/java/com/ibm/fhir/model/util/ValidationSupport.java
@@ -412,8 +412,10 @@ public static void requireValueOrChildren(Element element) {
     }
 
     /**
+     * @deprecated https://jira.hl7.org/browse/FHIR-26565 has clarified that empty resources are allowed
      * @throws IllegalStateException if the passed element has no children
      */
+    @Deprecated
     public static void requireChildren(Resource resource) {
         if (!resource.hasChildren()) {
             throw new IllegalStateException("global-1: All FHIR elements must have a @value or children");
diff --git a/fhir-tools/src/main/java/com/ibm/fhir/tools/CodeGenerator.java b/fhir-tools/src/main/java/com/ibm/fhir/tools/CodeGenerator.java
index e1bf302ca7e..44f7705f818 100644
--- a/fhir-tools/src/main/java/com/ibm/fhir/tools/CodeGenerator.java
+++ b/fhir-tools/src/main/java/com/ibm/fhir/tools/CodeGenerator.java
@@ -1271,10 +1271,6 @@ private void generateClass(JsonObject structureDefinition, List<String> paths, C
                 cb.invoke("ValidationSupport", "requireValueOrChildren", args("this"));
             }
 
-            if (isResource(structureDefinition) && !isAbstract(structureDefinition) && !nested) {
-                cb.invoke("ValidationSupport", "requireChildren", args("this"));
-            }
-
             if (isXhtml(structureDefinition)) {
                 cb.invoke("ValidationSupport", "checkXHTMLContent", args("value"));
             }