diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index e8fc9907e..3dddf5e11 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -42,11 +42,13 @@ jobs:
           coverage report -m --skip-covered
 
       - name: Check coverage report
-        if: github.ref != 'refs/heads/main'
+        # Disable coverage checking from forks until there is a secure fix for:
+        # https://github.com/orgoro/coverage/issues/259
+        if: github.ref != 'refs/heads/main' && ${{ ! github.event.pull_request.head.repo.fork }}
         uses: orgoro/coverage@v3.2
         with:
           coverageFile: coverage.xml
           token: ${{ secrets.GITHUB_TOKEN }}
-          thresholdAll: .35
+          thresholdAll: .45
           thresholdNew: 1
-          thresholdModified: 0
+          thresholdModified: .40
diff --git a/fhir-parser-resources/template-resource.py b/fhir-parser-resources/template-resource.py
index 1858b4cd0..9eb892116 100644
--- a/fhir-parser-resources/template-resource.py
+++ b/fhir-parser-resources/template-resource.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR {{ info.version }} ({{ profile.url }}) on {{ info.date }}.
 #  {{ info.year }}, SMART Health IT.
 
@@ -79,13 +76,7 @@ def elementProperties(self):
 {%- endif %}
 {%- endfor %}
 
-{% if imports|length > 0 and imported|length != imports|length %}
-import sys
-{%- endif %}
-{%- for imp in imports %}{% if imp.module not in imported %}
-try:
-    from . import {{ imp.module }}
-except ImportError:
-    {{ imp.module }} = sys.modules[__package__ + '.{{ imp.module }}']
+{% for imp in imports %}{% if imp.module not in imported %}
+from . import {{ imp.module }}
 {%- endif %}{% endfor %}
 
diff --git a/fhirclient/__init__.py b/fhirclient/__init__.py
index 7b45e7658..e69de29bb 100644
--- a/fhirclient/__init__.py
+++ b/fhirclient/__init__.py
@@ -1,5 +0,0 @@
-import sys
-import os.path
-abspath = os.path.abspath(os.path.dirname(__file__))
-if abspath not in sys.path:
-    sys.path.insert(0, abspath)
diff --git a/fhirclient/auth.py b/fhirclient/auth.py
index 8b688df61..fb3e3b9d7 100644
--- a/fhirclient/auth.py
+++ b/fhirclient/auth.py
@@ -1,14 +1,8 @@
-# -*- coding: utf-8 -*-
-
 import uuid
 import logging
 from datetime import datetime, timedelta
-try:                                # Python 2.x
-    import urlparse
-    from urllib import urlencode
-except Exception as e:              # Python 3
-    import urllib.parse as urlparse
-    from urllib.parse import urlencode
+import urllib.parse as urlparse
+from urllib.parse import urlencode
 
 logger = logging.getLogger(__name__)
 
diff --git a/fhirclient/client.py b/fhirclient/client.py
index 7999820ad..f492a6dfc 100644
--- a/fhirclient/client.py
+++ b/fhirclient/client.py
@@ -1,8 +1,6 @@
-# -*- coding: utf-8 -*-
-
 import logging
 
-from server import FHIRServer, FHIRUnauthorizedException, FHIRNotFoundException
+from .server import FHIRServer, FHIRUnauthorizedException, FHIRNotFoundException
 
 __version__ = '4.2.0'
 __author__ = 'SMART Platforms Team'
diff --git a/fhirclient/models/account.py b/fhirclient/models/account.py
index fa66ff9cc..e42075db1 100644
--- a/fhirclient/models/account.py
+++ b/fhirclient/models/account.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Account) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -168,20 +165,7 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
+from . import codeableconcept
+from . import fhirreference
+from . import identifier
+from . import period
diff --git a/fhirclient/models/activitydefinition.py b/fhirclient/models/activitydefinition.py
index 32b396a05..e53c51528 100644
--- a/fhirclient/models/activitydefinition.py
+++ b/fhirclient/models/activitydefinition.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/ActivityDefinition) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -378,64 +375,18 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import age
-except ImportError:
-    age = sys.modules[__package__ + '.age']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import contactdetail
-except ImportError:
-    contactdetail = sys.modules[__package__ + '.contactdetail']
-try:
-    from . import dosage
-except ImportError:
-    dosage = sys.modules[__package__ + '.dosage']
-try:
-    from . import duration
-except ImportError:
-    duration = sys.modules[__package__ + '.duration']
-try:
-    from . import expression
-except ImportError:
-    expression = sys.modules[__package__ + '.expression']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
-try:
-    from . import quantity
-except ImportError:
-    quantity = sys.modules[__package__ + '.quantity']
-try:
-    from . import range
-except ImportError:
-    range = sys.modules[__package__ + '.range']
-try:
-    from . import relatedartifact
-except ImportError:
-    relatedartifact = sys.modules[__package__ + '.relatedartifact']
-try:
-    from . import timing
-except ImportError:
-    timing = sys.modules[__package__ + '.timing']
-try:
-    from . import usagecontext
-except ImportError:
-    usagecontext = sys.modules[__package__ + '.usagecontext']
+from . import age
+from . import codeableconcept
+from . import contactdetail
+from . import dosage
+from . import duration
+from . import expression
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import period
+from . import quantity
+from . import range
+from . import relatedartifact
+from . import timing
+from . import usagecontext
diff --git a/fhirclient/models/address.py b/fhirclient/models/address.py
index 566b5f689..1c98e6258 100644
--- a/fhirclient/models/address.py
+++ b/fhirclient/models/address.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Address) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -87,8 +84,4 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
+from . import period
diff --git a/fhirclient/models/adverseevent.py b/fhirclient/models/adverseevent.py
index 9808dbe77..6746462b6 100644
--- a/fhirclient/models/adverseevent.py
+++ b/fhirclient/models/adverseevent.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/AdverseEvent) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -222,20 +219,7 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
+from . import codeableconcept
+from . import fhirdate
+from . import fhirreference
+from . import identifier
diff --git a/fhirclient/models/age.py b/fhirclient/models/age.py
index bc692ae10..9bc07d4a4 100644
--- a/fhirclient/models/age.py
+++ b/fhirclient/models/age.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Age) on 2024-07-15.
 #  2024, SMART Health IT.
 
diff --git a/fhirclient/models/allergyintolerance.py b/fhirclient/models/allergyintolerance.py
index bfd5fa3b1..1a494e138 100644
--- a/fhirclient/models/allergyintolerance.py
+++ b/fhirclient/models/allergyintolerance.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/AllergyIntolerance) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -197,36 +194,11 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import age
-except ImportError:
-    age = sys.modules[__package__ + '.age']
-try:
-    from . import annotation
-except ImportError:
-    annotation = sys.modules[__package__ + '.annotation']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
-try:
-    from . import range
-except ImportError:
-    range = sys.modules[__package__ + '.range']
+from . import age
+from . import annotation
+from . import codeableconcept
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import period
+from . import range
diff --git a/fhirclient/models/annotation.py b/fhirclient/models/annotation.py
index a4f834256..ce2f0f827 100644
--- a/fhirclient/models/annotation.py
+++ b/fhirclient/models/annotation.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Annotation) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -53,12 +50,5 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
+from . import fhirdate
+from . import fhirreference
diff --git a/fhirclient/models/appointment.py b/fhirclient/models/appointment.py
index ec5d6aabc..74d240a05 100644
--- a/fhirclient/models/appointment.py
+++ b/fhirclient/models/appointment.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Appointment) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -200,24 +197,8 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
+from . import codeableconcept
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import period
diff --git a/fhirclient/models/appointmentresponse.py b/fhirclient/models/appointmentresponse.py
index a89cafa18..e012c5ca1 100644
--- a/fhirclient/models/appointmentresponse.py
+++ b/fhirclient/models/appointmentresponse.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/AppointmentResponse) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -71,20 +68,7 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
+from . import codeableconcept
+from . import fhirdate
+from . import fhirreference
+from . import identifier
diff --git a/fhirclient/models/attachment.py b/fhirclient/models/attachment.py
index f5413948a..802f5764f 100644
--- a/fhirclient/models/attachment.py
+++ b/fhirclient/models/attachment.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Attachment) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -72,8 +69,4 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
+from . import fhirdate
diff --git a/fhirclient/models/auditevent.py b/fhirclient/models/auditevent.py
index e00758edc..f37bea60f 100644
--- a/fhirclient/models/auditevent.py
+++ b/fhirclient/models/auditevent.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/AuditEvent) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -357,24 +354,8 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import coding
-except ImportError:
-    coding = sys.modules[__package__ + '.coding']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
+from . import codeableconcept
+from . import coding
+from . import fhirdate
+from . import fhirreference
+from . import period
diff --git a/fhirclient/models/backboneelement.py b/fhirclient/models/backboneelement.py
index a45ac3c96..9ce13a20e 100644
--- a/fhirclient/models/backboneelement.py
+++ b/fhirclient/models/backboneelement.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/BackboneElement) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -38,8 +35,4 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import extension
-except ImportError:
-    extension = sys.modules[__package__ + '.extension']
+from . import extension
diff --git a/fhirclient/models/basic.py b/fhirclient/models/basic.py
index 15f75d6a8..6f7d4d106 100644
--- a/fhirclient/models/basic.py
+++ b/fhirclient/models/basic.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Basic) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -59,20 +56,7 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
+from . import codeableconcept
+from . import fhirdate
+from . import fhirreference
+from . import identifier
diff --git a/fhirclient/models/binary.py b/fhirclient/models/binary.py
index 95ff72057..2f841ab12 100644
--- a/fhirclient/models/binary.py
+++ b/fhirclient/models/binary.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Binary) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -50,8 +47,4 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
+from . import fhirreference
diff --git a/fhirclient/models/biologicallyderivedproduct.py b/fhirclient/models/biologicallyderivedproduct.py
index 094af8b06..3dd056346 100644
--- a/fhirclient/models/biologicallyderivedproduct.py
+++ b/fhirclient/models/biologicallyderivedproduct.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/BiologicallyDerivedProduct) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -271,24 +268,8 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
+from . import codeableconcept
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import period
diff --git a/fhirclient/models/bodystructure.py b/fhirclient/models/bodystructure.py
index 33a4cf241..21de3c16e 100644
--- a/fhirclient/models/bodystructure.py
+++ b/fhirclient/models/bodystructure.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/BodyStructure) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -74,20 +71,7 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import attachment
-except ImportError:
-    attachment = sys.modules[__package__ + '.attachment']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
+from . import attachment
+from . import codeableconcept
+from . import fhirreference
+from . import identifier
diff --git a/fhirclient/models/bundle.py b/fhirclient/models/bundle.py
index a789dca86..7a8821727 100644
--- a/fhirclient/models/bundle.py
+++ b/fhirclient/models/bundle.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Bundle) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -307,16 +304,6 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import signature
-except ImportError:
-    signature = sys.modules[__package__ + '.signature']
+from . import fhirdate
+from . import identifier
+from . import signature
diff --git a/fhirclient/models/capabilitystatement.py b/fhirclient/models/capabilitystatement.py
index 2553484c1..b04b207b9 100644
--- a/fhirclient/models/capabilitystatement.py
+++ b/fhirclient/models/capabilitystatement.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/CapabilityStatement) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -788,28 +785,9 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import coding
-except ImportError:
-    coding = sys.modules[__package__ + '.coding']
-try:
-    from . import contactdetail
-except ImportError:
-    contactdetail = sys.modules[__package__ + '.contactdetail']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import usagecontext
-except ImportError:
-    usagecontext = sys.modules[__package__ + '.usagecontext']
+from . import codeableconcept
+from . import coding
+from . import contactdetail
+from . import fhirdate
+from . import fhirreference
+from . import usagecontext
diff --git a/fhirclient/models/careplan.py b/fhirclient/models/careplan.py
index c8718426d..3443c29e9 100644
--- a/fhirclient/models/careplan.py
+++ b/fhirclient/models/careplan.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/CarePlan) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -334,36 +331,11 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import annotation
-except ImportError:
-    annotation = sys.modules[__package__ + '.annotation']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
-try:
-    from . import quantity
-except ImportError:
-    quantity = sys.modules[__package__ + '.quantity']
-try:
-    from . import timing
-except ImportError:
-    timing = sys.modules[__package__ + '.timing']
+from . import annotation
+from . import codeableconcept
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import period
+from . import quantity
+from . import timing
diff --git a/fhirclient/models/careteam.py b/fhirclient/models/careteam.py
index 985be2a5f..52e09ebba 100644
--- a/fhirclient/models/careteam.py
+++ b/fhirclient/models/careteam.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/CareTeam) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -147,28 +144,9 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import annotation
-except ImportError:
-    annotation = sys.modules[__package__ + '.annotation']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import contactpoint
-except ImportError:
-    contactpoint = sys.modules[__package__ + '.contactpoint']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
+from . import annotation
+from . import codeableconcept
+from . import contactpoint
+from . import fhirreference
+from . import identifier
+from . import period
diff --git a/fhirclient/models/catalogentry.py b/fhirclient/models/catalogentry.py
index 1cb529469..933bc168b 100644
--- a/fhirclient/models/catalogentry.py
+++ b/fhirclient/models/catalogentry.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/CatalogEntry) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -138,24 +135,8 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
+from . import codeableconcept
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import period
diff --git a/fhirclient/models/chargeitem.py b/fhirclient/models/chargeitem.py
index 25ba48f37..fce87006c 100644
--- a/fhirclient/models/chargeitem.py
+++ b/fhirclient/models/chargeitem.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/ChargeItem) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -221,40 +218,12 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import annotation
-except ImportError:
-    annotation = sys.modules[__package__ + '.annotation']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import money
-except ImportError:
-    money = sys.modules[__package__ + '.money']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
-try:
-    from . import quantity
-except ImportError:
-    quantity = sys.modules[__package__ + '.quantity']
-try:
-    from . import timing
-except ImportError:
-    timing = sys.modules[__package__ + '.timing']
+from . import annotation
+from . import codeableconcept
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import money
+from . import period
+from . import quantity
+from . import timing
diff --git a/fhirclient/models/chargeitemdefinition.py b/fhirclient/models/chargeitemdefinition.py
index a7361c2d9..623492253 100644
--- a/fhirclient/models/chargeitemdefinition.py
+++ b/fhirclient/models/chargeitemdefinition.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/ChargeItemDefinition) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -284,36 +281,11 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import contactdetail
-except ImportError:
-    contactdetail = sys.modules[__package__ + '.contactdetail']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import money
-except ImportError:
-    money = sys.modules[__package__ + '.money']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
-try:
-    from . import usagecontext
-except ImportError:
-    usagecontext = sys.modules[__package__ + '.usagecontext']
+from . import codeableconcept
+from . import contactdetail
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import money
+from . import period
+from . import usagecontext
diff --git a/fhirclient/models/claim.py b/fhirclient/models/claim.py
index 592f0b0f0..eec719780 100644
--- a/fhirclient/models/claim.py
+++ b/fhirclient/models/claim.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Claim) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -910,40 +907,12 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import address
-except ImportError:
-    address = sys.modules[__package__ + '.address']
-try:
-    from . import attachment
-except ImportError:
-    attachment = sys.modules[__package__ + '.attachment']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import money
-except ImportError:
-    money = sys.modules[__package__ + '.money']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
-try:
-    from . import quantity
-except ImportError:
-    quantity = sys.modules[__package__ + '.quantity']
+from . import address
+from . import attachment
+from . import codeableconcept
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import money
+from . import period
+from . import quantity
diff --git a/fhirclient/models/claimresponse.py b/fhirclient/models/claimresponse.py
index f93df14b2..4a9b21a7a 100644
--- a/fhirclient/models/claimresponse.py
+++ b/fhirclient/models/claimresponse.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/ClaimResponse) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -847,40 +844,12 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import address
-except ImportError:
-    address = sys.modules[__package__ + '.address']
-try:
-    from . import attachment
-except ImportError:
-    attachment = sys.modules[__package__ + '.attachment']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import money
-except ImportError:
-    money = sys.modules[__package__ + '.money']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
-try:
-    from . import quantity
-except ImportError:
-    quantity = sys.modules[__package__ + '.quantity']
+from . import address
+from . import attachment
+from . import codeableconcept
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import money
+from . import period
+from . import quantity
diff --git a/fhirclient/models/clinicalimpression.py b/fhirclient/models/clinicalimpression.py
index 69e71d2ef..1f377c654 100644
--- a/fhirclient/models/clinicalimpression.py
+++ b/fhirclient/models/clinicalimpression.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/ClinicalImpression) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -226,28 +223,9 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import annotation
-except ImportError:
-    annotation = sys.modules[__package__ + '.annotation']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
+from . import annotation
+from . import codeableconcept
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import period
diff --git a/fhirclient/models/codeableconcept.py b/fhirclient/models/codeableconcept.py
index 3f912dc4c..be871f8c2 100644
--- a/fhirclient/models/codeableconcept.py
+++ b/fhirclient/models/codeableconcept.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/CodeableConcept) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -43,8 +40,4 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import coding
-except ImportError:
-    coding = sys.modules[__package__ + '.coding']
+from . import coding
diff --git a/fhirclient/models/codesystem.py b/fhirclient/models/codesystem.py
index 9e566ca56..d03bf07ef 100644
--- a/fhirclient/models/codesystem.py
+++ b/fhirclient/models/codesystem.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/CodeSystem) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -426,28 +423,9 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import coding
-except ImportError:
-    coding = sys.modules[__package__ + '.coding']
-try:
-    from . import contactdetail
-except ImportError:
-    contactdetail = sys.modules[__package__ + '.contactdetail']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import usagecontext
-except ImportError:
-    usagecontext = sys.modules[__package__ + '.usagecontext']
+from . import codeableconcept
+from . import coding
+from . import contactdetail
+from . import fhirdate
+from . import identifier
+from . import usagecontext
diff --git a/fhirclient/models/coding.py b/fhirclient/models/coding.py
index f61177fa6..cdf89e560 100644
--- a/fhirclient/models/coding.py
+++ b/fhirclient/models/coding.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Coding) on 2024-07-15.
 #  2024, SMART Health IT.
 
diff --git a/fhirclient/models/communication.py b/fhirclient/models/communication.py
index 2a225c9e7..98c6727ab 100644
--- a/fhirclient/models/communication.py
+++ b/fhirclient/models/communication.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Communication) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -192,28 +189,9 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import annotation
-except ImportError:
-    annotation = sys.modules[__package__ + '.annotation']
-try:
-    from . import attachment
-except ImportError:
-    attachment = sys.modules[__package__ + '.attachment']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
+from . import annotation
+from . import attachment
+from . import codeableconcept
+from . import fhirdate
+from . import fhirreference
+from . import identifier
diff --git a/fhirclient/models/communicationrequest.py b/fhirclient/models/communicationrequest.py
index c3ead2c59..05437192b 100644
--- a/fhirclient/models/communicationrequest.py
+++ b/fhirclient/models/communicationrequest.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/CommunicationRequest) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -192,32 +189,10 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import annotation
-except ImportError:
-    annotation = sys.modules[__package__ + '.annotation']
-try:
-    from . import attachment
-except ImportError:
-    attachment = sys.modules[__package__ + '.attachment']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
+from . import annotation
+from . import attachment
+from . import codeableconcept
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import period
diff --git a/fhirclient/models/compartmentdefinition.py b/fhirclient/models/compartmentdefinition.py
index dfc93d29e..a22cb0c68 100644
--- a/fhirclient/models/compartmentdefinition.py
+++ b/fhirclient/models/compartmentdefinition.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/CompartmentDefinition) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -146,16 +143,6 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import contactdetail
-except ImportError:
-    contactdetail = sys.modules[__package__ + '.contactdetail']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import usagecontext
-except ImportError:
-    usagecontext = sys.modules[__package__ + '.usagecontext']
+from . import contactdetail
+from . import fhirdate
+from . import usagecontext
diff --git a/fhirclient/models/composition.py b/fhirclient/models/composition.py
index 0148d7f9c..018689549 100644
--- a/fhirclient/models/composition.py
+++ b/fhirclient/models/composition.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Composition) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -316,28 +313,9 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import narrative
-except ImportError:
-    narrative = sys.modules[__package__ + '.narrative']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
+from . import codeableconcept
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import narrative
+from . import period
diff --git a/fhirclient/models/conceptmap.py b/fhirclient/models/conceptmap.py
index 3637b6543..64ce2e38f 100644
--- a/fhirclient/models/conceptmap.py
+++ b/fhirclient/models/conceptmap.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/ConceptMap) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -386,24 +383,8 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import contactdetail
-except ImportError:
-    contactdetail = sys.modules[__package__ + '.contactdetail']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import usagecontext
-except ImportError:
-    usagecontext = sys.modules[__package__ + '.usagecontext']
+from . import codeableconcept
+from . import contactdetail
+from . import fhirdate
+from . import identifier
+from . import usagecontext
diff --git a/fhirclient/models/condition.py b/fhirclient/models/condition.py
index be015fe61..d4114071e 100644
--- a/fhirclient/models/condition.py
+++ b/fhirclient/models/condition.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Condition) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -239,36 +236,11 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import age
-except ImportError:
-    age = sys.modules[__package__ + '.age']
-try:
-    from . import annotation
-except ImportError:
-    annotation = sys.modules[__package__ + '.annotation']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
-try:
-    from . import range
-except ImportError:
-    range = sys.modules[__package__ + '.range']
+from . import age
+from . import annotation
+from . import codeableconcept
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import period
+from . import range
diff --git a/fhirclient/models/consent.py b/fhirclient/models/consent.py
index 431bdd85f..e0f9bb9bc 100644
--- a/fhirclient/models/consent.py
+++ b/fhirclient/models/consent.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Consent) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -337,32 +334,10 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import attachment
-except ImportError:
-    attachment = sys.modules[__package__ + '.attachment']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import coding
-except ImportError:
-    coding = sys.modules[__package__ + '.coding']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
+from . import attachment
+from . import codeableconcept
+from . import coding
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import period
diff --git a/fhirclient/models/contactdetail.py b/fhirclient/models/contactdetail.py
index 8b1763d84..9e4ce7f55 100644
--- a/fhirclient/models/contactdetail.py
+++ b/fhirclient/models/contactdetail.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/ContactDetail) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -42,8 +39,4 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import contactpoint
-except ImportError:
-    contactpoint = sys.modules[__package__ + '.contactpoint']
+from . import contactpoint
diff --git a/fhirclient/models/contactpoint.py b/fhirclient/models/contactpoint.py
index b99cae3ab..1049f6213 100644
--- a/fhirclient/models/contactpoint.py
+++ b/fhirclient/models/contactpoint.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/ContactPoint) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -58,8 +55,4 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
+from . import period
diff --git a/fhirclient/models/contract.py b/fhirclient/models/contract.py
index 33ea6e72a..79676ce1f 100644
--- a/fhirclient/models/contract.py
+++ b/fhirclient/models/contract.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Contract) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -1162,52 +1159,15 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import annotation
-except ImportError:
-    annotation = sys.modules[__package__ + '.annotation']
-try:
-    from . import attachment
-except ImportError:
-    attachment = sys.modules[__package__ + '.attachment']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import coding
-except ImportError:
-    coding = sys.modules[__package__ + '.coding']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import money
-except ImportError:
-    money = sys.modules[__package__ + '.money']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
-try:
-    from . import quantity
-except ImportError:
-    quantity = sys.modules[__package__ + '.quantity']
-try:
-    from . import signature
-except ImportError:
-    signature = sys.modules[__package__ + '.signature']
-try:
-    from . import timing
-except ImportError:
-    timing = sys.modules[__package__ + '.timing']
+from . import annotation
+from . import attachment
+from . import codeableconcept
+from . import coding
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import money
+from . import period
+from . import quantity
+from . import signature
+from . import timing
diff --git a/fhirclient/models/contributor.py b/fhirclient/models/contributor.py
index d519f8f68..522d00bfd 100644
--- a/fhirclient/models/contributor.py
+++ b/fhirclient/models/contributor.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Contributor) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -48,8 +45,4 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import contactdetail
-except ImportError:
-    contactdetail = sys.modules[__package__ + '.contactdetail']
+from . import contactdetail
diff --git a/fhirclient/models/count.py b/fhirclient/models/count.py
index ace7a58ea..9b7fdf9ab 100644
--- a/fhirclient/models/count.py
+++ b/fhirclient/models/count.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Count) on 2024-07-15.
 #  2024, SMART Health IT.
 
diff --git a/fhirclient/models/coverage.py b/fhirclient/models/coverage.py
index 856c4ee95..5c4576239 100644
--- a/fhirclient/models/coverage.py
+++ b/fhirclient/models/coverage.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Coverage) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -243,28 +240,9 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import money
-except ImportError:
-    money = sys.modules[__package__ + '.money']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
-try:
-    from . import quantity
-except ImportError:
-    quantity = sys.modules[__package__ + '.quantity']
+from . import codeableconcept
+from . import fhirreference
+from . import identifier
+from . import money
+from . import period
+from . import quantity
diff --git a/fhirclient/models/coverageeligibilityrequest.py b/fhirclient/models/coverageeligibilityrequest.py
index 63286996c..6b64876fd 100644
--- a/fhirclient/models/coverageeligibilityrequest.py
+++ b/fhirclient/models/coverageeligibilityrequest.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/CoverageEligibilityRequest) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -306,32 +303,10 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import money
-except ImportError:
-    money = sys.modules[__package__ + '.money']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
-try:
-    from . import quantity
-except ImportError:
-    quantity = sys.modules[__package__ + '.quantity']
+from . import codeableconcept
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import money
+from . import period
+from . import quantity
diff --git a/fhirclient/models/coverageeligibilityresponse.py b/fhirclient/models/coverageeligibilityresponse.py
index 117d1ea37..2e18b0a6e 100644
--- a/fhirclient/models/coverageeligibilityresponse.py
+++ b/fhirclient/models/coverageeligibilityresponse.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/CoverageEligibilityResponse) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -347,28 +344,9 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import money
-except ImportError:
-    money = sys.modules[__package__ + '.money']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
+from . import codeableconcept
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import money
+from . import period
diff --git a/fhirclient/models/datarequirement.py b/fhirclient/models/datarequirement.py
index 2467e1d8e..abf4984f1 100644
--- a/fhirclient/models/datarequirement.py
+++ b/fhirclient/models/datarequirement.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/DataRequirement) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -216,28 +213,9 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import coding
-except ImportError:
-    coding = sys.modules[__package__ + '.coding']
-try:
-    from . import duration
-except ImportError:
-    duration = sys.modules[__package__ + '.duration']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
+from . import codeableconcept
+from . import coding
+from . import duration
+from . import fhirdate
+from . import fhirreference
+from . import period
diff --git a/fhirclient/models/detectedissue.py b/fhirclient/models/detectedissue.py
index 5dfffeb5b..2b9c6088d 100644
--- a/fhirclient/models/detectedissue.py
+++ b/fhirclient/models/detectedissue.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/DetectedIssue) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -181,24 +178,8 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
+from . import codeableconcept
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import period
diff --git a/fhirclient/models/device.py b/fhirclient/models/device.py
index 6d08330d2..bf34891e9 100644
--- a/fhirclient/models/device.py
+++ b/fhirclient/models/device.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Device) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -380,32 +377,10 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import annotation
-except ImportError:
-    annotation = sys.modules[__package__ + '.annotation']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import contactpoint
-except ImportError:
-    contactpoint = sys.modules[__package__ + '.contactpoint']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import quantity
-except ImportError:
-    quantity = sys.modules[__package__ + '.quantity']
+from . import annotation
+from . import codeableconcept
+from . import contactpoint
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import quantity
diff --git a/fhirclient/models/devicedefinition.py b/fhirclient/models/devicedefinition.py
index 079dc2884..e21167467 100644
--- a/fhirclient/models/devicedefinition.py
+++ b/fhirclient/models/devicedefinition.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/DeviceDefinition) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -381,36 +378,11 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import annotation
-except ImportError:
-    annotation = sys.modules[__package__ + '.annotation']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import contactpoint
-except ImportError:
-    contactpoint = sys.modules[__package__ + '.contactpoint']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import prodcharacteristic
-except ImportError:
-    prodcharacteristic = sys.modules[__package__ + '.prodcharacteristic']
-try:
-    from . import productshelflife
-except ImportError:
-    productshelflife = sys.modules[__package__ + '.productshelflife']
-try:
-    from . import quantity
-except ImportError:
-    quantity = sys.modules[__package__ + '.quantity']
+from . import annotation
+from . import codeableconcept
+from . import contactpoint
+from . import fhirreference
+from . import identifier
+from . import prodcharacteristic
+from . import productshelflife
+from . import quantity
diff --git a/fhirclient/models/devicemetric.py b/fhirclient/models/devicemetric.py
index 0e9d685a4..44068dbbc 100644
--- a/fhirclient/models/devicemetric.py
+++ b/fhirclient/models/devicemetric.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/DeviceMetric) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -125,24 +122,8 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import timing
-except ImportError:
-    timing = sys.modules[__package__ + '.timing']
+from . import codeableconcept
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import timing
diff --git a/fhirclient/models/devicerequest.py b/fhirclient/models/devicerequest.py
index f1b701445..5b13d6fdc 100644
--- a/fhirclient/models/devicerequest.py
+++ b/fhirclient/models/devicerequest.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/DeviceRequest) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -224,40 +221,12 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import annotation
-except ImportError:
-    annotation = sys.modules[__package__ + '.annotation']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
-try:
-    from . import quantity
-except ImportError:
-    quantity = sys.modules[__package__ + '.quantity']
-try:
-    from . import range
-except ImportError:
-    range = sys.modules[__package__ + '.range']
-try:
-    from . import timing
-except ImportError:
-    timing = sys.modules[__package__ + '.timing']
+from . import annotation
+from . import codeableconcept
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import period
+from . import quantity
+from . import range
+from . import timing
diff --git a/fhirclient/models/deviceusestatement.py b/fhirclient/models/deviceusestatement.py
index d2401c784..7da88ce9b 100644
--- a/fhirclient/models/deviceusestatement.py
+++ b/fhirclient/models/deviceusestatement.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/DeviceUseStatement) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -108,32 +105,10 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import annotation
-except ImportError:
-    annotation = sys.modules[__package__ + '.annotation']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
-try:
-    from . import timing
-except ImportError:
-    timing = sys.modules[__package__ + '.timing']
+from . import annotation
+from . import codeableconcept
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import period
+from . import timing
diff --git a/fhirclient/models/diagnosticreport.py b/fhirclient/models/diagnosticreport.py
index ed62e616a..e50837756 100644
--- a/fhirclient/models/diagnosticreport.py
+++ b/fhirclient/models/diagnosticreport.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/DiagnosticReport) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -172,28 +169,9 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import attachment
-except ImportError:
-    attachment = sys.modules[__package__ + '.attachment']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
+from . import attachment
+from . import codeableconcept
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import period
diff --git a/fhirclient/models/distance.py b/fhirclient/models/distance.py
index 06ee82f54..5af7ddd25 100644
--- a/fhirclient/models/distance.py
+++ b/fhirclient/models/distance.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Distance) on 2024-07-15.
 #  2024, SMART Health IT.
 
diff --git a/fhirclient/models/documentmanifest.py b/fhirclient/models/documentmanifest.py
index 4b6b099bb..f670fe2a7 100644
--- a/fhirclient/models/documentmanifest.py
+++ b/fhirclient/models/documentmanifest.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/DocumentManifest) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -130,20 +127,7 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
+from . import codeableconcept
+from . import fhirdate
+from . import fhirreference
+from . import identifier
diff --git a/fhirclient/models/documentreference.py b/fhirclient/models/documentreference.py
index cb4146c4d..e5b4d6be1 100644
--- a/fhirclient/models/documentreference.py
+++ b/fhirclient/models/documentreference.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/DocumentReference) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -251,32 +248,10 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import attachment
-except ImportError:
-    attachment = sys.modules[__package__ + '.attachment']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import coding
-except ImportError:
-    coding = sys.modules[__package__ + '.coding']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
+from . import attachment
+from . import codeableconcept
+from . import coding
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import period
diff --git a/fhirclient/models/domainresource.py b/fhirclient/models/domainresource.py
index e94b6c69b..523dda180 100644
--- a/fhirclient/models/domainresource.py
+++ b/fhirclient/models/domainresource.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/DomainResource) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -52,12 +49,5 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import extension
-except ImportError:
-    extension = sys.modules[__package__ + '.extension']
-try:
-    from . import narrative
-except ImportError:
-    narrative = sys.modules[__package__ + '.narrative']
+from . import extension
+from . import narrative
diff --git a/fhirclient/models/dosage.py b/fhirclient/models/dosage.py
index a2a27a0ff..bc53817db 100644
--- a/fhirclient/models/dosage.py
+++ b/fhirclient/models/dosage.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Dosage) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -161,24 +158,8 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import quantity
-except ImportError:
-    quantity = sys.modules[__package__ + '.quantity']
-try:
-    from . import range
-except ImportError:
-    range = sys.modules[__package__ + '.range']
-try:
-    from . import ratio
-except ImportError:
-    ratio = sys.modules[__package__ + '.ratio']
-try:
-    from . import timing
-except ImportError:
-    timing = sys.modules[__package__ + '.timing']
+from . import codeableconcept
+from . import quantity
+from . import range
+from . import ratio
+from . import timing
diff --git a/fhirclient/models/duration.py b/fhirclient/models/duration.py
index 8c8eaa2c4..20d76100f 100644
--- a/fhirclient/models/duration.py
+++ b/fhirclient/models/duration.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Duration) on 2024-07-15.
 #  2024, SMART Health IT.
 
diff --git a/fhirclient/models/effectevidencesynthesis.py b/fhirclient/models/effectevidencesynthesis.py
index 4de194d12..252972117 100644
--- a/fhirclient/models/effectevidencesynthesis.py
+++ b/fhirclient/models/effectevidencesynthesis.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/EffectEvidenceSynthesis) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -469,40 +466,12 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import annotation
-except ImportError:
-    annotation = sys.modules[__package__ + '.annotation']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import contactdetail
-except ImportError:
-    contactdetail = sys.modules[__package__ + '.contactdetail']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
-try:
-    from . import relatedartifact
-except ImportError:
-    relatedartifact = sys.modules[__package__ + '.relatedartifact']
-try:
-    from . import usagecontext
-except ImportError:
-    usagecontext = sys.modules[__package__ + '.usagecontext']
+from . import annotation
+from . import codeableconcept
+from . import contactdetail
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import period
+from . import relatedartifact
+from . import usagecontext
diff --git a/fhirclient/models/element.py b/fhirclient/models/element.py
index b4ad4e093..c555758e4 100644
--- a/fhirclient/models/element.py
+++ b/fhirclient/models/element.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Element) on 2024-07-15.
 #  2024, SMART Health IT.
 
diff --git a/fhirclient/models/elementdefinition.py b/fhirclient/models/elementdefinition.py
index 78a2d17a1..9e70282ea 100644
--- a/fhirclient/models/elementdefinition.py
+++ b/fhirclient/models/elementdefinition.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/ElementDefinition) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -1639,132 +1636,35 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import address
-except ImportError:
-    address = sys.modules[__package__ + '.address']
-try:
-    from . import age
-except ImportError:
-    age = sys.modules[__package__ + '.age']
-try:
-    from . import annotation
-except ImportError:
-    annotation = sys.modules[__package__ + '.annotation']
-try:
-    from . import attachment
-except ImportError:
-    attachment = sys.modules[__package__ + '.attachment']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import coding
-except ImportError:
-    coding = sys.modules[__package__ + '.coding']
-try:
-    from . import contactdetail
-except ImportError:
-    contactdetail = sys.modules[__package__ + '.contactdetail']
-try:
-    from . import contactpoint
-except ImportError:
-    contactpoint = sys.modules[__package__ + '.contactpoint']
-try:
-    from . import contributor
-except ImportError:
-    contributor = sys.modules[__package__ + '.contributor']
-try:
-    from . import count
-except ImportError:
-    count = sys.modules[__package__ + '.count']
-try:
-    from . import datarequirement
-except ImportError:
-    datarequirement = sys.modules[__package__ + '.datarequirement']
-try:
-    from . import distance
-except ImportError:
-    distance = sys.modules[__package__ + '.distance']
-try:
-    from . import dosage
-except ImportError:
-    dosage = sys.modules[__package__ + '.dosage']
-try:
-    from . import duration
-except ImportError:
-    duration = sys.modules[__package__ + '.duration']
-try:
-    from . import expression
-except ImportError:
-    expression = sys.modules[__package__ + '.expression']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import humanname
-except ImportError:
-    humanname = sys.modules[__package__ + '.humanname']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import meta
-except ImportError:
-    meta = sys.modules[__package__ + '.meta']
-try:
-    from . import money
-except ImportError:
-    money = sys.modules[__package__ + '.money']
-try:
-    from . import parameterdefinition
-except ImportError:
-    parameterdefinition = sys.modules[__package__ + '.parameterdefinition']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
-try:
-    from . import quantity
-except ImportError:
-    quantity = sys.modules[__package__ + '.quantity']
-try:
-    from . import range
-except ImportError:
-    range = sys.modules[__package__ + '.range']
-try:
-    from . import ratio
-except ImportError:
-    ratio = sys.modules[__package__ + '.ratio']
-try:
-    from . import relatedartifact
-except ImportError:
-    relatedartifact = sys.modules[__package__ + '.relatedartifact']
-try:
-    from . import sampleddata
-except ImportError:
-    sampleddata = sys.modules[__package__ + '.sampleddata']
-try:
-    from . import signature
-except ImportError:
-    signature = sys.modules[__package__ + '.signature']
-try:
-    from . import timing
-except ImportError:
-    timing = sys.modules[__package__ + '.timing']
-try:
-    from . import triggerdefinition
-except ImportError:
-    triggerdefinition = sys.modules[__package__ + '.triggerdefinition']
-try:
-    from . import usagecontext
-except ImportError:
-    usagecontext = sys.modules[__package__ + '.usagecontext']
+from . import address
+from . import age
+from . import annotation
+from . import attachment
+from . import codeableconcept
+from . import coding
+from . import contactdetail
+from . import contactpoint
+from . import contributor
+from . import count
+from . import datarequirement
+from . import distance
+from . import dosage
+from . import duration
+from . import expression
+from . import fhirdate
+from . import fhirreference
+from . import humanname
+from . import identifier
+from . import meta
+from . import money
+from . import parameterdefinition
+from . import period
+from . import quantity
+from . import range
+from . import ratio
+from . import relatedartifact
+from . import sampleddata
+from . import signature
+from . import timing
+from . import triggerdefinition
+from . import usagecontext
diff --git a/fhirclient/models/encounter.py b/fhirclient/models/encounter.py
index 937019959..62a3eb68f 100644
--- a/fhirclient/models/encounter.py
+++ b/fhirclient/models/encounter.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Encounter) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -427,28 +424,9 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import coding
-except ImportError:
-    coding = sys.modules[__package__ + '.coding']
-try:
-    from . import duration
-except ImportError:
-    duration = sys.modules[__package__ + '.duration']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
+from . import codeableconcept
+from . import coding
+from . import duration
+from . import fhirreference
+from . import identifier
+from . import period
diff --git a/fhirclient/models/endpoint.py b/fhirclient/models/endpoint.py
index df9a319c7..9dc1eac60 100644
--- a/fhirclient/models/endpoint.py
+++ b/fhirclient/models/endpoint.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Endpoint) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -93,28 +90,9 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import coding
-except ImportError:
-    coding = sys.modules[__package__ + '.coding']
-try:
-    from . import contactpoint
-except ImportError:
-    contactpoint = sys.modules[__package__ + '.contactpoint']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
+from . import codeableconcept
+from . import coding
+from . import contactpoint
+from . import fhirreference
+from . import identifier
+from . import period
diff --git a/fhirclient/models/enrollmentrequest.py b/fhirclient/models/enrollmentrequest.py
index b15b07229..02bdc8c46 100644
--- a/fhirclient/models/enrollmentrequest.py
+++ b/fhirclient/models/enrollmentrequest.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/EnrollmentRequest) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -68,16 +65,6 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
+from . import fhirdate
+from . import fhirreference
+from . import identifier
diff --git a/fhirclient/models/enrollmentresponse.py b/fhirclient/models/enrollmentresponse.py
index d1a422515..fb1e37c6d 100644
--- a/fhirclient/models/enrollmentresponse.py
+++ b/fhirclient/models/enrollmentresponse.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/EnrollmentResponse) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -73,16 +70,6 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
+from . import fhirdate
+from . import fhirreference
+from . import identifier
diff --git a/fhirclient/models/episodeofcare.py b/fhirclient/models/episodeofcare.py
index 52ae325ca..96d7311b9 100644
--- a/fhirclient/models/episodeofcare.py
+++ b/fhirclient/models/episodeofcare.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/EpisodeOfCare) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -179,20 +176,7 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
+from . import codeableconcept
+from . import fhirreference
+from . import identifier
+from . import period
diff --git a/fhirclient/models/eventdefinition.py b/fhirclient/models/eventdefinition.py
index 2d066d34d..ac857551a 100644
--- a/fhirclient/models/eventdefinition.py
+++ b/fhirclient/models/eventdefinition.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/EventDefinition) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -179,40 +176,12 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import contactdetail
-except ImportError:
-    contactdetail = sys.modules[__package__ + '.contactdetail']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
-try:
-    from . import relatedartifact
-except ImportError:
-    relatedartifact = sys.modules[__package__ + '.relatedartifact']
-try:
-    from . import triggerdefinition
-except ImportError:
-    triggerdefinition = sys.modules[__package__ + '.triggerdefinition']
-try:
-    from . import usagecontext
-except ImportError:
-    usagecontext = sys.modules[__package__ + '.usagecontext']
+from . import codeableconcept
+from . import contactdetail
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import period
+from . import relatedartifact
+from . import triggerdefinition
+from . import usagecontext
diff --git a/fhirclient/models/evidence.py b/fhirclient/models/evidence.py
index 8cc4247ca..21ff41e7d 100644
--- a/fhirclient/models/evidence.py
+++ b/fhirclient/models/evidence.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Evidence) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -176,40 +173,12 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import annotation
-except ImportError:
-    annotation = sys.modules[__package__ + '.annotation']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import contactdetail
-except ImportError:
-    contactdetail = sys.modules[__package__ + '.contactdetail']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
-try:
-    from . import relatedartifact
-except ImportError:
-    relatedartifact = sys.modules[__package__ + '.relatedartifact']
-try:
-    from . import usagecontext
-except ImportError:
-    usagecontext = sys.modules[__package__ + '.usagecontext']
+from . import annotation
+from . import codeableconcept
+from . import contactdetail
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import period
+from . import relatedartifact
+from . import usagecontext
diff --git a/fhirclient/models/evidencevariable.py b/fhirclient/models/evidencevariable.py
index ea93c4874..dbdf8aba5 100644
--- a/fhirclient/models/evidencevariable.py
+++ b/fhirclient/models/evidencevariable.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/EvidenceVariable) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -274,60 +271,17 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import annotation
-except ImportError:
-    annotation = sys.modules[__package__ + '.annotation']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import contactdetail
-except ImportError:
-    contactdetail = sys.modules[__package__ + '.contactdetail']
-try:
-    from . import datarequirement
-except ImportError:
-    datarequirement = sys.modules[__package__ + '.datarequirement']
-try:
-    from . import duration
-except ImportError:
-    duration = sys.modules[__package__ + '.duration']
-try:
-    from . import expression
-except ImportError:
-    expression = sys.modules[__package__ + '.expression']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
-try:
-    from . import relatedartifact
-except ImportError:
-    relatedartifact = sys.modules[__package__ + '.relatedartifact']
-try:
-    from . import timing
-except ImportError:
-    timing = sys.modules[__package__ + '.timing']
-try:
-    from . import triggerdefinition
-except ImportError:
-    triggerdefinition = sys.modules[__package__ + '.triggerdefinition']
-try:
-    from . import usagecontext
-except ImportError:
-    usagecontext = sys.modules[__package__ + '.usagecontext']
+from . import annotation
+from . import codeableconcept
+from . import contactdetail
+from . import datarequirement
+from . import duration
+from . import expression
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import period
+from . import relatedartifact
+from . import timing
+from . import triggerdefinition
+from . import usagecontext
diff --git a/fhirclient/models/examplescenario.py b/fhirclient/models/examplescenario.py
index 09379dc6e..ad36d37ad 100644
--- a/fhirclient/models/examplescenario.py
+++ b/fhirclient/models/examplescenario.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/ExampleScenario) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -488,24 +485,8 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import contactdetail
-except ImportError:
-    contactdetail = sys.modules[__package__ + '.contactdetail']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import usagecontext
-except ImportError:
-    usagecontext = sys.modules[__package__ + '.usagecontext']
+from . import codeableconcept
+from . import contactdetail
+from . import fhirdate
+from . import identifier
+from . import usagecontext
diff --git a/fhirclient/models/explanationofbenefit.py b/fhirclient/models/explanationofbenefit.py
index 39c20d31f..aa9721465 100644
--- a/fhirclient/models/explanationofbenefit.py
+++ b/fhirclient/models/explanationofbenefit.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/ExplanationOfBenefit) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -1565,44 +1562,13 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import address
-except ImportError:
-    address = sys.modules[__package__ + '.address']
-try:
-    from . import attachment
-except ImportError:
-    attachment = sys.modules[__package__ + '.attachment']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import coding
-except ImportError:
-    coding = sys.modules[__package__ + '.coding']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import money
-except ImportError:
-    money = sys.modules[__package__ + '.money']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
-try:
-    from . import quantity
-except ImportError:
-    quantity = sys.modules[__package__ + '.quantity']
+from . import address
+from . import attachment
+from . import codeableconcept
+from . import coding
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import money
+from . import period
+from . import quantity
diff --git a/fhirclient/models/expression.py b/fhirclient/models/expression.py
index 858c149e2..b3ff3e2a4 100644
--- a/fhirclient/models/expression.py
+++ b/fhirclient/models/expression.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Expression) on 2024-07-15.
 #  2024, SMART Health IT.
 
diff --git a/fhirclient/models/extension.py b/fhirclient/models/extension.py
index b87b1a049..e50cc0504 100644
--- a/fhirclient/models/extension.py
+++ b/fhirclient/models/extension.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Extension) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -287,132 +284,35 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import address
-except ImportError:
-    address = sys.modules[__package__ + '.address']
-try:
-    from . import age
-except ImportError:
-    age = sys.modules[__package__ + '.age']
-try:
-    from . import annotation
-except ImportError:
-    annotation = sys.modules[__package__ + '.annotation']
-try:
-    from . import attachment
-except ImportError:
-    attachment = sys.modules[__package__ + '.attachment']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import coding
-except ImportError:
-    coding = sys.modules[__package__ + '.coding']
-try:
-    from . import contactdetail
-except ImportError:
-    contactdetail = sys.modules[__package__ + '.contactdetail']
-try:
-    from . import contactpoint
-except ImportError:
-    contactpoint = sys.modules[__package__ + '.contactpoint']
-try:
-    from . import contributor
-except ImportError:
-    contributor = sys.modules[__package__ + '.contributor']
-try:
-    from . import count
-except ImportError:
-    count = sys.modules[__package__ + '.count']
-try:
-    from . import datarequirement
-except ImportError:
-    datarequirement = sys.modules[__package__ + '.datarequirement']
-try:
-    from . import distance
-except ImportError:
-    distance = sys.modules[__package__ + '.distance']
-try:
-    from . import dosage
-except ImportError:
-    dosage = sys.modules[__package__ + '.dosage']
-try:
-    from . import duration
-except ImportError:
-    duration = sys.modules[__package__ + '.duration']
-try:
-    from . import expression
-except ImportError:
-    expression = sys.modules[__package__ + '.expression']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import humanname
-except ImportError:
-    humanname = sys.modules[__package__ + '.humanname']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import meta
-except ImportError:
-    meta = sys.modules[__package__ + '.meta']
-try:
-    from . import money
-except ImportError:
-    money = sys.modules[__package__ + '.money']
-try:
-    from . import parameterdefinition
-except ImportError:
-    parameterdefinition = sys.modules[__package__ + '.parameterdefinition']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
-try:
-    from . import quantity
-except ImportError:
-    quantity = sys.modules[__package__ + '.quantity']
-try:
-    from . import range
-except ImportError:
-    range = sys.modules[__package__ + '.range']
-try:
-    from . import ratio
-except ImportError:
-    ratio = sys.modules[__package__ + '.ratio']
-try:
-    from . import relatedartifact
-except ImportError:
-    relatedartifact = sys.modules[__package__ + '.relatedartifact']
-try:
-    from . import sampleddata
-except ImportError:
-    sampleddata = sys.modules[__package__ + '.sampleddata']
-try:
-    from . import signature
-except ImportError:
-    signature = sys.modules[__package__ + '.signature']
-try:
-    from . import timing
-except ImportError:
-    timing = sys.modules[__package__ + '.timing']
-try:
-    from . import triggerdefinition
-except ImportError:
-    triggerdefinition = sys.modules[__package__ + '.triggerdefinition']
-try:
-    from . import usagecontext
-except ImportError:
-    usagecontext = sys.modules[__package__ + '.usagecontext']
+from . import address
+from . import age
+from . import annotation
+from . import attachment
+from . import codeableconcept
+from . import coding
+from . import contactdetail
+from . import contactpoint
+from . import contributor
+from . import count
+from . import datarequirement
+from . import distance
+from . import dosage
+from . import duration
+from . import expression
+from . import fhirdate
+from . import fhirreference
+from . import humanname
+from . import identifier
+from . import meta
+from . import money
+from . import parameterdefinition
+from . import period
+from . import quantity
+from . import range
+from . import ratio
+from . import relatedartifact
+from . import sampleddata
+from . import signature
+from . import timing
+from . import triggerdefinition
+from . import usagecontext
diff --git a/fhirclient/models/familymemberhistory.py b/fhirclient/models/familymemberhistory.py
index 94b82c3d7..2784160e8 100644
--- a/fhirclient/models/familymemberhistory.py
+++ b/fhirclient/models/familymemberhistory.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/FamilyMemberHistory) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -233,36 +230,11 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import age
-except ImportError:
-    age = sys.modules[__package__ + '.age']
-try:
-    from . import annotation
-except ImportError:
-    annotation = sys.modules[__package__ + '.annotation']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
-try:
-    from . import range
-except ImportError:
-    range = sys.modules[__package__ + '.range']
+from . import age
+from . import annotation
+from . import codeableconcept
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import period
+from . import range
diff --git a/fhirclient/models/flag.py b/fhirclient/models/flag.py
index 187b5369a..f871e3fbd 100644
--- a/fhirclient/models/flag.py
+++ b/fhirclient/models/flag.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Flag) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -73,20 +70,7 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
+from . import codeableconcept
+from . import fhirreference
+from . import identifier
+from . import period
diff --git a/fhirclient/models/goal.py b/fhirclient/models/goal.py
index be6ed4901..c6ffc3cba 100644
--- a/fhirclient/models/goal.py
+++ b/fhirclient/models/goal.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Goal) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -199,40 +196,12 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import annotation
-except ImportError:
-    annotation = sys.modules[__package__ + '.annotation']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import duration
-except ImportError:
-    duration = sys.modules[__package__ + '.duration']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import quantity
-except ImportError:
-    quantity = sys.modules[__package__ + '.quantity']
-try:
-    from . import range
-except ImportError:
-    range = sys.modules[__package__ + '.range']
-try:
-    from . import ratio
-except ImportError:
-    ratio = sys.modules[__package__ + '.ratio']
+from . import annotation
+from . import codeableconcept
+from . import duration
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import quantity
+from . import range
+from . import ratio
diff --git a/fhirclient/models/graphdefinition.py b/fhirclient/models/graphdefinition.py
index 8e7026349..7a4f68486 100644
--- a/fhirclient/models/graphdefinition.py
+++ b/fhirclient/models/graphdefinition.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/GraphDefinition) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -261,20 +258,7 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import contactdetail
-except ImportError:
-    contactdetail = sys.modules[__package__ + '.contactdetail']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import usagecontext
-except ImportError:
-    usagecontext = sys.modules[__package__ + '.usagecontext']
+from . import codeableconcept
+from . import contactdetail
+from . import fhirdate
+from . import usagecontext
diff --git a/fhirclient/models/group.py b/fhirclient/models/group.py
index b60f1b4ef..86bf115a6 100644
--- a/fhirclient/models/group.py
+++ b/fhirclient/models/group.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Group) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -193,28 +190,9 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
-try:
-    from . import quantity
-except ImportError:
-    quantity = sys.modules[__package__ + '.quantity']
-try:
-    from . import range
-except ImportError:
-    range = sys.modules[__package__ + '.range']
+from . import codeableconcept
+from . import fhirreference
+from . import identifier
+from . import period
+from . import quantity
+from . import range
diff --git a/fhirclient/models/guidanceresponse.py b/fhirclient/models/guidanceresponse.py
index 8a60d8637..d2a528271 100644
--- a/fhirclient/models/guidanceresponse.py
+++ b/fhirclient/models/guidanceresponse.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/GuidanceResponse) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -120,28 +117,9 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import annotation
-except ImportError:
-    annotation = sys.modules[__package__ + '.annotation']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import datarequirement
-except ImportError:
-    datarequirement = sys.modules[__package__ + '.datarequirement']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
+from . import annotation
+from . import codeableconcept
+from . import datarequirement
+from . import fhirdate
+from . import fhirreference
+from . import identifier
diff --git a/fhirclient/models/healthcareservice.py b/fhirclient/models/healthcareservice.py
index 61794cbef..1c892086d 100644
--- a/fhirclient/models/healthcareservice.py
+++ b/fhirclient/models/healthcareservice.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/HealthcareService) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -272,32 +269,10 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import attachment
-except ImportError:
-    attachment = sys.modules[__package__ + '.attachment']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import contactpoint
-except ImportError:
-    contactpoint = sys.modules[__package__ + '.contactpoint']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
+from . import attachment
+from . import codeableconcept
+from . import contactpoint
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import period
diff --git a/fhirclient/models/humanname.py b/fhirclient/models/humanname.py
index 1d8426c58..cd30864c7 100644
--- a/fhirclient/models/humanname.py
+++ b/fhirclient/models/humanname.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/HumanName) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -67,8 +64,4 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
+from . import period
diff --git a/fhirclient/models/identifier.py b/fhirclient/models/identifier.py
index 80a1e9fde..eba4b048c 100644
--- a/fhirclient/models/identifier.py
+++ b/fhirclient/models/identifier.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Identifier) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -63,16 +60,6 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
+from . import codeableconcept
+from . import fhirreference
+from . import period
diff --git a/fhirclient/models/imagingstudy.py b/fhirclient/models/imagingstudy.py
index ad3273cd8..648f8d314 100644
--- a/fhirclient/models/imagingstudy.py
+++ b/fhirclient/models/imagingstudy.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/ImagingStudy) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -305,28 +302,9 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import annotation
-except ImportError:
-    annotation = sys.modules[__package__ + '.annotation']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import coding
-except ImportError:
-    coding = sys.modules[__package__ + '.coding']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
+from . import annotation
+from . import codeableconcept
+from . import coding
+from . import fhirdate
+from . import fhirreference
+from . import identifier
diff --git a/fhirclient/models/immunization.py b/fhirclient/models/immunization.py
index f94259696..55d6090bf 100644
--- a/fhirclient/models/immunization.py
+++ b/fhirclient/models/immunization.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Immunization) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -363,28 +360,9 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import annotation
-except ImportError:
-    annotation = sys.modules[__package__ + '.annotation']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import quantity
-except ImportError:
-    quantity = sys.modules[__package__ + '.quantity']
+from . import annotation
+from . import codeableconcept
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import quantity
diff --git a/fhirclient/models/immunizationevaluation.py b/fhirclient/models/immunizationevaluation.py
index 8dd8d8b1a..9969a51f1 100644
--- a/fhirclient/models/immunizationevaluation.py
+++ b/fhirclient/models/immunizationevaluation.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/ImmunizationEvaluation) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -109,20 +106,7 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
+from . import codeableconcept
+from . import fhirdate
+from . import fhirreference
+from . import identifier
diff --git a/fhirclient/models/immunizationrecommendation.py b/fhirclient/models/immunizationrecommendation.py
index 5d39e23c1..f2f1fceca 100644
--- a/fhirclient/models/immunizationrecommendation.py
+++ b/fhirclient/models/immunizationrecommendation.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/ImmunizationRecommendation) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -189,20 +186,7 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
+from . import codeableconcept
+from . import fhirdate
+from . import fhirreference
+from . import identifier
diff --git a/fhirclient/models/implementationguide.py b/fhirclient/models/implementationguide.py
index 0f00ff465..aaf752284 100644
--- a/fhirclient/models/implementationguide.py
+++ b/fhirclient/models/implementationguide.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/ImplementationGuide) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -629,24 +626,8 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import contactdetail
-except ImportError:
-    contactdetail = sys.modules[__package__ + '.contactdetail']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import usagecontext
-except ImportError:
-    usagecontext = sys.modules[__package__ + '.usagecontext']
+from . import codeableconcept
+from . import contactdetail
+from . import fhirdate
+from . import fhirreference
+from . import usagecontext
diff --git a/fhirclient/models/insuranceplan.py b/fhirclient/models/insuranceplan.py
index 05f7e68ec..d700a22e6 100644
--- a/fhirclient/models/insuranceplan.py
+++ b/fhirclient/models/insuranceplan.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/InsurancePlan) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -477,40 +474,12 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import address
-except ImportError:
-    address = sys.modules[__package__ + '.address']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import contactpoint
-except ImportError:
-    contactpoint = sys.modules[__package__ + '.contactpoint']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import humanname
-except ImportError:
-    humanname = sys.modules[__package__ + '.humanname']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import money
-except ImportError:
-    money = sys.modules[__package__ + '.money']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
-try:
-    from . import quantity
-except ImportError:
-    quantity = sys.modules[__package__ + '.quantity']
+from . import address
+from . import codeableconcept
+from . import contactpoint
+from . import fhirreference
+from . import humanname
+from . import identifier
+from . import money
+from . import period
+from . import quantity
diff --git a/fhirclient/models/invoice.py b/fhirclient/models/invoice.py
index 29f108870..fc5c81c02 100644
--- a/fhirclient/models/invoice.py
+++ b/fhirclient/models/invoice.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Invoice) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -249,28 +246,9 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import annotation
-except ImportError:
-    annotation = sys.modules[__package__ + '.annotation']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import money
-except ImportError:
-    money = sys.modules[__package__ + '.money']
+from . import annotation
+from . import codeableconcept
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import money
diff --git a/fhirclient/models/library.py b/fhirclient/models/library.py
index 8db48d47e..cb1ceda1e 100644
--- a/fhirclient/models/library.py
+++ b/fhirclient/models/library.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Library) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -197,48 +194,14 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import attachment
-except ImportError:
-    attachment = sys.modules[__package__ + '.attachment']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import contactdetail
-except ImportError:
-    contactdetail = sys.modules[__package__ + '.contactdetail']
-try:
-    from . import datarequirement
-except ImportError:
-    datarequirement = sys.modules[__package__ + '.datarequirement']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import parameterdefinition
-except ImportError:
-    parameterdefinition = sys.modules[__package__ + '.parameterdefinition']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
-try:
-    from . import relatedartifact
-except ImportError:
-    relatedartifact = sys.modules[__package__ + '.relatedartifact']
-try:
-    from . import usagecontext
-except ImportError:
-    usagecontext = sys.modules[__package__ + '.usagecontext']
+from . import attachment
+from . import codeableconcept
+from . import contactdetail
+from . import datarequirement
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import parameterdefinition
+from . import period
+from . import relatedartifact
+from . import usagecontext
diff --git a/fhirclient/models/linkage.py b/fhirclient/models/linkage.py
index fb5cf6cd1..07e5794b1 100644
--- a/fhirclient/models/linkage.py
+++ b/fhirclient/models/linkage.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Linkage) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -87,8 +84,4 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
+from . import fhirreference
diff --git a/fhirclient/models/list.py b/fhirclient/models/list.py
index 5af5d84a3..14387ea88 100644
--- a/fhirclient/models/list.py
+++ b/fhirclient/models/list.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/List) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -142,24 +139,8 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import annotation
-except ImportError:
-    annotation = sys.modules[__package__ + '.annotation']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
+from . import annotation
+from . import codeableconcept
+from . import fhirdate
+from . import fhirreference
+from . import identifier
diff --git a/fhirclient/models/location.py b/fhirclient/models/location.py
index ca58e9adc..4655ca86d 100644
--- a/fhirclient/models/location.py
+++ b/fhirclient/models/location.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Location) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -209,32 +206,10 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import address
-except ImportError:
-    address = sys.modules[__package__ + '.address']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import coding
-except ImportError:
-    coding = sys.modules[__package__ + '.coding']
-try:
-    from . import contactpoint
-except ImportError:
-    contactpoint = sys.modules[__package__ + '.contactpoint']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
+from . import address
+from . import codeableconcept
+from . import coding
+from . import contactpoint
+from . import fhirdate
+from . import fhirreference
+from . import identifier
diff --git a/fhirclient/models/marketingstatus.py b/fhirclient/models/marketingstatus.py
index d0f178bc7..12790151b 100644
--- a/fhirclient/models/marketingstatus.py
+++ b/fhirclient/models/marketingstatus.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/MarketingStatus) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -77,16 +74,6 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
+from . import codeableconcept
+from . import fhirdate
+from . import period
diff --git a/fhirclient/models/measure.py b/fhirclient/models/measure.py
index 853ac0746..b713318ad 100644
--- a/fhirclient/models/measure.py
+++ b/fhirclient/models/measure.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Measure) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -472,40 +469,12 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import contactdetail
-except ImportError:
-    contactdetail = sys.modules[__package__ + '.contactdetail']
-try:
-    from . import expression
-except ImportError:
-    expression = sys.modules[__package__ + '.expression']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
-try:
-    from . import relatedartifact
-except ImportError:
-    relatedartifact = sys.modules[__package__ + '.relatedartifact']
-try:
-    from . import usagecontext
-except ImportError:
-    usagecontext = sys.modules[__package__ + '.usagecontext']
+from . import codeableconcept
+from . import contactdetail
+from . import expression
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import period
+from . import relatedartifact
+from . import usagecontext
diff --git a/fhirclient/models/measurereport.py b/fhirclient/models/measurereport.py
index 9936f0128..b4db126dd 100644
--- a/fhirclient/models/measurereport.py
+++ b/fhirclient/models/measurereport.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/MeasureReport) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -343,28 +340,9 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
-try:
-    from . import quantity
-except ImportError:
-    quantity = sys.modules[__package__ + '.quantity']
+from . import codeableconcept
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import period
+from . import quantity
diff --git a/fhirclient/models/media.py b/fhirclient/models/media.py
index 721406bbf..eecca7565 100644
--- a/fhirclient/models/media.py
+++ b/fhirclient/models/media.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Media) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -147,32 +144,10 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import annotation
-except ImportError:
-    annotation = sys.modules[__package__ + '.annotation']
-try:
-    from . import attachment
-except ImportError:
-    attachment = sys.modules[__package__ + '.attachment']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
+from . import annotation
+from . import attachment
+from . import codeableconcept
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import period
diff --git a/fhirclient/models/medication.py b/fhirclient/models/medication.py
index 3c3137726..0c6bf2a4a 100644
--- a/fhirclient/models/medication.py
+++ b/fhirclient/models/medication.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Medication) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -156,24 +153,8 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import ratio
-except ImportError:
-    ratio = sys.modules[__package__ + '.ratio']
+from . import codeableconcept
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import ratio
diff --git a/fhirclient/models/medicationadministration.py b/fhirclient/models/medicationadministration.py
index 93ac64f7f..f37c7d915 100644
--- a/fhirclient/models/medicationadministration.py
+++ b/fhirclient/models/medicationadministration.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/MedicationAdministration) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -242,36 +239,11 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import annotation
-except ImportError:
-    annotation = sys.modules[__package__ + '.annotation']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
-try:
-    from . import quantity
-except ImportError:
-    quantity = sys.modules[__package__ + '.quantity']
-try:
-    from . import ratio
-except ImportError:
-    ratio = sys.modules[__package__ + '.ratio']
+from . import annotation
+from . import codeableconcept
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import period
+from . import quantity
+from . import ratio
diff --git a/fhirclient/models/medicationdispense.py b/fhirclient/models/medicationdispense.py
index ddaa73c1d..6a54a745e 100644
--- a/fhirclient/models/medicationdispense.py
+++ b/fhirclient/models/medicationdispense.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/MedicationDispense) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -255,32 +252,10 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import annotation
-except ImportError:
-    annotation = sys.modules[__package__ + '.annotation']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import dosage
-except ImportError:
-    dosage = sys.modules[__package__ + '.dosage']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import quantity
-except ImportError:
-    quantity = sys.modules[__package__ + '.quantity']
+from . import annotation
+from . import codeableconcept
+from . import dosage
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import quantity
diff --git a/fhirclient/models/medicationknowledge.py b/fhirclient/models/medicationknowledge.py
index 93311c839..6ee424c14 100644
--- a/fhirclient/models/medicationknowledge.py
+++ b/fhirclient/models/medicationknowledge.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/MedicationKnowledge) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -763,32 +760,10 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import dosage
-except ImportError:
-    dosage = sys.modules[__package__ + '.dosage']
-try:
-    from . import duration
-except ImportError:
-    duration = sys.modules[__package__ + '.duration']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import money
-except ImportError:
-    money = sys.modules[__package__ + '.money']
-try:
-    from . import quantity
-except ImportError:
-    quantity = sys.modules[__package__ + '.quantity']
-try:
-    from . import ratio
-except ImportError:
-    ratio = sys.modules[__package__ + '.ratio']
+from . import codeableconcept
+from . import dosage
+from . import duration
+from . import fhirreference
+from . import money
+from . import quantity
+from . import ratio
diff --git a/fhirclient/models/medicationrequest.py b/fhirclient/models/medicationrequest.py
index 004d95c64..ae50bca50 100644
--- a/fhirclient/models/medicationrequest.py
+++ b/fhirclient/models/medicationrequest.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/MedicationRequest) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -356,40 +353,12 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import annotation
-except ImportError:
-    annotation = sys.modules[__package__ + '.annotation']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import dosage
-except ImportError:
-    dosage = sys.modules[__package__ + '.dosage']
-try:
-    from . import duration
-except ImportError:
-    duration = sys.modules[__package__ + '.duration']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
-try:
-    from . import quantity
-except ImportError:
-    quantity = sys.modules[__package__ + '.quantity']
+from . import annotation
+from . import codeableconcept
+from . import dosage
+from . import duration
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import period
+from . import quantity
diff --git a/fhirclient/models/medicationstatement.py b/fhirclient/models/medicationstatement.py
index 793945c89..ece0d0d3b 100644
--- a/fhirclient/models/medicationstatement.py
+++ b/fhirclient/models/medicationstatement.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/MedicationStatement) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -153,32 +150,10 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import annotation
-except ImportError:
-    annotation = sys.modules[__package__ + '.annotation']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import dosage
-except ImportError:
-    dosage = sys.modules[__package__ + '.dosage']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
+from . import annotation
+from . import codeableconcept
+from . import dosage
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import period
diff --git a/fhirclient/models/medicinalproduct.py b/fhirclient/models/medicinalproduct.py
index df0e5dffa..9ad223dc3 100644
--- a/fhirclient/models/medicinalproduct.py
+++ b/fhirclient/models/medicinalproduct.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/MedicinalProduct) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -369,28 +366,9 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import coding
-except ImportError:
-    coding = sys.modules[__package__ + '.coding']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import marketingstatus
-except ImportError:
-    marketingstatus = sys.modules[__package__ + '.marketingstatus']
+from . import codeableconcept
+from . import coding
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import marketingstatus
diff --git a/fhirclient/models/medicinalproductauthorization.py b/fhirclient/models/medicinalproductauthorization.py
index d76bdd248..47b3f1cbb 100644
--- a/fhirclient/models/medicinalproductauthorization.py
+++ b/fhirclient/models/medicinalproductauthorization.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/MedicinalProductAuthorization) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -217,24 +214,8 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
+from . import codeableconcept
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import period
diff --git a/fhirclient/models/medicinalproductcontraindication.py b/fhirclient/models/medicinalproductcontraindication.py
index e16b71025..db3146dbc 100644
--- a/fhirclient/models/medicinalproductcontraindication.py
+++ b/fhirclient/models/medicinalproductcontraindication.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/MedicinalProductContraindication) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -116,16 +113,6 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import population
-except ImportError:
-    population = sys.modules[__package__ + '.population']
+from . import codeableconcept
+from . import fhirreference
+from . import population
diff --git a/fhirclient/models/medicinalproductindication.py b/fhirclient/models/medicinalproductindication.py
index 8069a6fc8..e6dba811f 100644
--- a/fhirclient/models/medicinalproductindication.py
+++ b/fhirclient/models/medicinalproductindication.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/MedicinalProductIndication) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -128,20 +125,7 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import population
-except ImportError:
-    population = sys.modules[__package__ + '.population']
-try:
-    from . import quantity
-except ImportError:
-    quantity = sys.modules[__package__ + '.quantity']
+from . import codeableconcept
+from . import fhirreference
+from . import population
+from . import quantity
diff --git a/fhirclient/models/medicinalproductingredient.py b/fhirclient/models/medicinalproductingredient.py
index 0958acb6e..62c529c6a 100644
--- a/fhirclient/models/medicinalproductingredient.py
+++ b/fhirclient/models/medicinalproductingredient.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/MedicinalProductIngredient) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -254,20 +251,7 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import ratio
-except ImportError:
-    ratio = sys.modules[__package__ + '.ratio']
+from . import codeableconcept
+from . import fhirreference
+from . import identifier
+from . import ratio
diff --git a/fhirclient/models/medicinalproductinteraction.py b/fhirclient/models/medicinalproductinteraction.py
index b0c0dedca..cc59b9823 100644
--- a/fhirclient/models/medicinalproductinteraction.py
+++ b/fhirclient/models/medicinalproductinteraction.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/MedicinalProductInteraction) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -105,12 +102,5 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
+from . import codeableconcept
+from . import fhirreference
diff --git a/fhirclient/models/medicinalproductmanufactured.py b/fhirclient/models/medicinalproductmanufactured.py
index cc884e5ff..46cb66d32 100644
--- a/fhirclient/models/medicinalproductmanufactured.py
+++ b/fhirclient/models/medicinalproductmanufactured.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/MedicinalProductManufactured) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -68,20 +65,7 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import prodcharacteristic
-except ImportError:
-    prodcharacteristic = sys.modules[__package__ + '.prodcharacteristic']
-try:
-    from . import quantity
-except ImportError:
-    quantity = sys.modules[__package__ + '.quantity']
+from . import codeableconcept
+from . import fhirreference
+from . import prodcharacteristic
+from . import quantity
diff --git a/fhirclient/models/medicinalproductpackaged.py b/fhirclient/models/medicinalproductpackaged.py
index 3216a35a4..4dfa2080f 100644
--- a/fhirclient/models/medicinalproductpackaged.py
+++ b/fhirclient/models/medicinalproductpackaged.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/MedicinalProductPackaged) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -199,32 +196,10 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import marketingstatus
-except ImportError:
-    marketingstatus = sys.modules[__package__ + '.marketingstatus']
-try:
-    from . import prodcharacteristic
-except ImportError:
-    prodcharacteristic = sys.modules[__package__ + '.prodcharacteristic']
-try:
-    from . import productshelflife
-except ImportError:
-    productshelflife = sys.modules[__package__ + '.productshelflife']
-try:
-    from . import quantity
-except ImportError:
-    quantity = sys.modules[__package__ + '.quantity']
+from . import codeableconcept
+from . import fhirreference
+from . import identifier
+from . import marketingstatus
+from . import prodcharacteristic
+from . import productshelflife
+from . import quantity
diff --git a/fhirclient/models/medicinalproductpharmaceutical.py b/fhirclient/models/medicinalproductpharmaceutical.py
index 0cc7544a9..eceafae78 100644
--- a/fhirclient/models/medicinalproductpharmaceutical.py
+++ b/fhirclient/models/medicinalproductpharmaceutical.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/MedicinalProductPharmaceutical) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -244,28 +241,9 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import duration
-except ImportError:
-    duration = sys.modules[__package__ + '.duration']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import quantity
-except ImportError:
-    quantity = sys.modules[__package__ + '.quantity']
-try:
-    from . import ratio
-except ImportError:
-    ratio = sys.modules[__package__ + '.ratio']
+from . import codeableconcept
+from . import duration
+from . import fhirreference
+from . import identifier
+from . import quantity
+from . import ratio
diff --git a/fhirclient/models/medicinalproductundesirableeffect.py b/fhirclient/models/medicinalproductundesirableeffect.py
index ba7c57e66..de99bb4cd 100644
--- a/fhirclient/models/medicinalproductundesirableeffect.py
+++ b/fhirclient/models/medicinalproductundesirableeffect.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/MedicinalProductUndesirableEffect) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -57,16 +54,6 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import population
-except ImportError:
-    population = sys.modules[__package__ + '.population']
+from . import codeableconcept
+from . import fhirreference
+from . import population
diff --git a/fhirclient/models/messagedefinition.py b/fhirclient/models/messagedefinition.py
index cbfc5f53b..a50d2a224 100644
--- a/fhirclient/models/messagedefinition.py
+++ b/fhirclient/models/messagedefinition.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/MessageDefinition) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -245,28 +242,9 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import coding
-except ImportError:
-    coding = sys.modules[__package__ + '.coding']
-try:
-    from . import contactdetail
-except ImportError:
-    contactdetail = sys.modules[__package__ + '.contactdetail']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import usagecontext
-except ImportError:
-    usagecontext = sys.modules[__package__ + '.usagecontext']
+from . import codeableconcept
+from . import coding
+from . import contactdetail
+from . import fhirdate
+from . import identifier
+from . import usagecontext
diff --git a/fhirclient/models/messageheader.py b/fhirclient/models/messageheader.py
index 8bbef6ec7..f01e09341 100644
--- a/fhirclient/models/messageheader.py
+++ b/fhirclient/models/messageheader.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/MessageHeader) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -236,20 +233,7 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import coding
-except ImportError:
-    coding = sys.modules[__package__ + '.coding']
-try:
-    from . import contactpoint
-except ImportError:
-    contactpoint = sys.modules[__package__ + '.contactpoint']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
+from . import codeableconcept
+from . import coding
+from . import contactpoint
+from . import fhirreference
diff --git a/fhirclient/models/meta.py b/fhirclient/models/meta.py
index 33fa0790a..4147e445d 100644
--- a/fhirclient/models/meta.py
+++ b/fhirclient/models/meta.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Meta) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -64,12 +61,5 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import coding
-except ImportError:
-    coding = sys.modules[__package__ + '.coding']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
+from . import coding
+from . import fhirdate
diff --git a/fhirclient/models/metadataresource.py b/fhirclient/models/metadataresource.py
index b2a25e8d5..40bf46acb 100644
--- a/fhirclient/models/metadataresource.py
+++ b/fhirclient/models/metadataresource.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/MetadataResource) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -92,20 +89,7 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import contactdetail
-except ImportError:
-    contactdetail = sys.modules[__package__ + '.contactdetail']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import usagecontext
-except ImportError:
-    usagecontext = sys.modules[__package__ + '.usagecontext']
+from . import codeableconcept
+from . import contactdetail
+from . import fhirdate
+from . import usagecontext
diff --git a/fhirclient/models/molecularsequence.py b/fhirclient/models/molecularsequence.py
index a58e5ae4b..dd945385e 100644
--- a/fhirclient/models/molecularsequence.py
+++ b/fhirclient/models/molecularsequence.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/MolecularSequence) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -587,20 +584,7 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import quantity
-except ImportError:
-    quantity = sys.modules[__package__ + '.quantity']
+from . import codeableconcept
+from . import fhirreference
+from . import identifier
+from . import quantity
diff --git a/fhirclient/models/money.py b/fhirclient/models/money.py
index 7967da5d8..bd7c09eb1 100644
--- a/fhirclient/models/money.py
+++ b/fhirclient/models/money.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Money) on 2024-07-15.
 #  2024, SMART Health IT.
 
diff --git a/fhirclient/models/namingsystem.py b/fhirclient/models/namingsystem.py
index ea51a590f..d99b6553f 100644
--- a/fhirclient/models/namingsystem.py
+++ b/fhirclient/models/namingsystem.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/NamingSystem) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -152,24 +149,8 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import contactdetail
-except ImportError:
-    contactdetail = sys.modules[__package__ + '.contactdetail']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
-try:
-    from . import usagecontext
-except ImportError:
-    usagecontext = sys.modules[__package__ + '.usagecontext']
+from . import codeableconcept
+from . import contactdetail
+from . import fhirdate
+from . import period
+from . import usagecontext
diff --git a/fhirclient/models/narrative.py b/fhirclient/models/narrative.py
index dfa9d0506..282793796 100644
--- a/fhirclient/models/narrative.py
+++ b/fhirclient/models/narrative.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Narrative) on 2024-07-15.
 #  2024, SMART Health IT.
 
diff --git a/fhirclient/models/nutritionorder.py b/fhirclient/models/nutritionorder.py
index 2129b1895..01525d1fc 100644
--- a/fhirclient/models/nutritionorder.py
+++ b/fhirclient/models/nutritionorder.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/NutritionOrder) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -424,36 +421,11 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import annotation
-except ImportError:
-    annotation = sys.modules[__package__ + '.annotation']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import quantity
-except ImportError:
-    quantity = sys.modules[__package__ + '.quantity']
-try:
-    from . import ratio
-except ImportError:
-    ratio = sys.modules[__package__ + '.ratio']
-try:
-    from . import timing
-except ImportError:
-    timing = sys.modules[__package__ + '.timing']
+from . import annotation
+from . import codeableconcept
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import quantity
+from . import ratio
+from . import timing
diff --git a/fhirclient/models/observation.py b/fhirclient/models/observation.py
index 1e5d28c50..5bdf46866 100644
--- a/fhirclient/models/observation.py
+++ b/fhirclient/models/observation.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Observation) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -383,48 +380,14 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import annotation
-except ImportError:
-    annotation = sys.modules[__package__ + '.annotation']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
-try:
-    from . import quantity
-except ImportError:
-    quantity = sys.modules[__package__ + '.quantity']
-try:
-    from . import range
-except ImportError:
-    range = sys.modules[__package__ + '.range']
-try:
-    from . import ratio
-except ImportError:
-    ratio = sys.modules[__package__ + '.ratio']
-try:
-    from . import sampleddata
-except ImportError:
-    sampleddata = sys.modules[__package__ + '.sampleddata']
-try:
-    from . import timing
-except ImportError:
-    timing = sys.modules[__package__ + '.timing']
+from . import annotation
+from . import codeableconcept
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import period
+from . import quantity
+from . import range
+from . import ratio
+from . import sampleddata
+from . import timing
diff --git a/fhirclient/models/observationdefinition.py b/fhirclient/models/observationdefinition.py
index 57f9952e7..826c74ca2 100644
--- a/fhirclient/models/observationdefinition.py
+++ b/fhirclient/models/observationdefinition.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/ObservationDefinition) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -216,20 +213,7 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import range
-except ImportError:
-    range = sys.modules[__package__ + '.range']
+from . import codeableconcept
+from . import fhirreference
+from . import identifier
+from . import range
diff --git a/fhirclient/models/operationdefinition.py b/fhirclient/models/operationdefinition.py
index 010b750d1..4a12dd25c 100644
--- a/fhirclient/models/operationdefinition.py
+++ b/fhirclient/models/operationdefinition.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/OperationDefinition) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -356,20 +353,7 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import contactdetail
-except ImportError:
-    contactdetail = sys.modules[__package__ + '.contactdetail']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import usagecontext
-except ImportError:
-    usagecontext = sys.modules[__package__ + '.usagecontext']
+from . import codeableconcept
+from . import contactdetail
+from . import fhirdate
+from . import usagecontext
diff --git a/fhirclient/models/operationoutcome.py b/fhirclient/models/operationoutcome.py
index 1069ebfa0..b945e344c 100644
--- a/fhirclient/models/operationoutcome.py
+++ b/fhirclient/models/operationoutcome.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/OperationOutcome) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -96,8 +93,4 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
+from . import codeableconcept
diff --git a/fhirclient/models/organization.py b/fhirclient/models/organization.py
index 06ce80967..97f26265e 100644
--- a/fhirclient/models/organization.py
+++ b/fhirclient/models/organization.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Organization) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -132,28 +129,9 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import address
-except ImportError:
-    address = sys.modules[__package__ + '.address']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import contactpoint
-except ImportError:
-    contactpoint = sys.modules[__package__ + '.contactpoint']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import humanname
-except ImportError:
-    humanname = sys.modules[__package__ + '.humanname']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
+from . import address
+from . import codeableconcept
+from . import contactpoint
+from . import fhirreference
+from . import humanname
+from . import identifier
diff --git a/fhirclient/models/organizationaffiliation.py b/fhirclient/models/organizationaffiliation.py
index 3234dd001..0c445328f 100644
--- a/fhirclient/models/organizationaffiliation.py
+++ b/fhirclient/models/organizationaffiliation.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/OrganizationAffiliation) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -98,24 +95,8 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import contactpoint
-except ImportError:
-    contactpoint = sys.modules[__package__ + '.contactpoint']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
+from . import codeableconcept
+from . import contactpoint
+from . import fhirreference
+from . import identifier
+from . import period
diff --git a/fhirclient/models/parameterdefinition.py b/fhirclient/models/parameterdefinition.py
index 47a8df20b..88c5b8824 100644
--- a/fhirclient/models/parameterdefinition.py
+++ b/fhirclient/models/parameterdefinition.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/ParameterDefinition) on 2024-07-15.
 #  2024, SMART Health IT.
 
diff --git a/fhirclient/models/parameters.py b/fhirclient/models/parameters.py
index da45cedf4..e2bd1ec41 100644
--- a/fhirclient/models/parameters.py
+++ b/fhirclient/models/parameters.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Parameters) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -331,132 +328,35 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import address
-except ImportError:
-    address = sys.modules[__package__ + '.address']
-try:
-    from . import age
-except ImportError:
-    age = sys.modules[__package__ + '.age']
-try:
-    from . import annotation
-except ImportError:
-    annotation = sys.modules[__package__ + '.annotation']
-try:
-    from . import attachment
-except ImportError:
-    attachment = sys.modules[__package__ + '.attachment']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import coding
-except ImportError:
-    coding = sys.modules[__package__ + '.coding']
-try:
-    from . import contactdetail
-except ImportError:
-    contactdetail = sys.modules[__package__ + '.contactdetail']
-try:
-    from . import contactpoint
-except ImportError:
-    contactpoint = sys.modules[__package__ + '.contactpoint']
-try:
-    from . import contributor
-except ImportError:
-    contributor = sys.modules[__package__ + '.contributor']
-try:
-    from . import count
-except ImportError:
-    count = sys.modules[__package__ + '.count']
-try:
-    from . import datarequirement
-except ImportError:
-    datarequirement = sys.modules[__package__ + '.datarequirement']
-try:
-    from . import distance
-except ImportError:
-    distance = sys.modules[__package__ + '.distance']
-try:
-    from . import dosage
-except ImportError:
-    dosage = sys.modules[__package__ + '.dosage']
-try:
-    from . import duration
-except ImportError:
-    duration = sys.modules[__package__ + '.duration']
-try:
-    from . import expression
-except ImportError:
-    expression = sys.modules[__package__ + '.expression']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import humanname
-except ImportError:
-    humanname = sys.modules[__package__ + '.humanname']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import meta
-except ImportError:
-    meta = sys.modules[__package__ + '.meta']
-try:
-    from . import money
-except ImportError:
-    money = sys.modules[__package__ + '.money']
-try:
-    from . import parameterdefinition
-except ImportError:
-    parameterdefinition = sys.modules[__package__ + '.parameterdefinition']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
-try:
-    from . import quantity
-except ImportError:
-    quantity = sys.modules[__package__ + '.quantity']
-try:
-    from . import range
-except ImportError:
-    range = sys.modules[__package__ + '.range']
-try:
-    from . import ratio
-except ImportError:
-    ratio = sys.modules[__package__ + '.ratio']
-try:
-    from . import relatedartifact
-except ImportError:
-    relatedartifact = sys.modules[__package__ + '.relatedartifact']
-try:
-    from . import sampleddata
-except ImportError:
-    sampleddata = sys.modules[__package__ + '.sampleddata']
-try:
-    from . import signature
-except ImportError:
-    signature = sys.modules[__package__ + '.signature']
-try:
-    from . import timing
-except ImportError:
-    timing = sys.modules[__package__ + '.timing']
-try:
-    from . import triggerdefinition
-except ImportError:
-    triggerdefinition = sys.modules[__package__ + '.triggerdefinition']
-try:
-    from . import usagecontext
-except ImportError:
-    usagecontext = sys.modules[__package__ + '.usagecontext']
+from . import address
+from . import age
+from . import annotation
+from . import attachment
+from . import codeableconcept
+from . import coding
+from . import contactdetail
+from . import contactpoint
+from . import contributor
+from . import count
+from . import datarequirement
+from . import distance
+from . import dosage
+from . import duration
+from . import expression
+from . import fhirdate
+from . import fhirreference
+from . import humanname
+from . import identifier
+from . import meta
+from . import money
+from . import parameterdefinition
+from . import period
+from . import quantity
+from . import range
+from . import ratio
+from . import relatedartifact
+from . import sampleddata
+from . import signature
+from . import timing
+from . import triggerdefinition
+from . import usagecontext
diff --git a/fhirclient/models/patient.py b/fhirclient/models/patient.py
index efd54a28d..811c6f25b 100644
--- a/fhirclient/models/patient.py
+++ b/fhirclient/models/patient.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Patient) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -257,40 +254,12 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import address
-except ImportError:
-    address = sys.modules[__package__ + '.address']
-try:
-    from . import attachment
-except ImportError:
-    attachment = sys.modules[__package__ + '.attachment']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import contactpoint
-except ImportError:
-    contactpoint = sys.modules[__package__ + '.contactpoint']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import humanname
-except ImportError:
-    humanname = sys.modules[__package__ + '.humanname']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
+from . import address
+from . import attachment
+from . import codeableconcept
+from . import contactpoint
+from . import fhirdate
+from . import fhirreference
+from . import humanname
+from . import identifier
+from . import period
diff --git a/fhirclient/models/paymentnotice.py b/fhirclient/models/paymentnotice.py
index e17eb0860..f617ea170 100644
--- a/fhirclient/models/paymentnotice.py
+++ b/fhirclient/models/paymentnotice.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/PaymentNotice) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -93,24 +90,8 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import money
-except ImportError:
-    money = sys.modules[__package__ + '.money']
+from . import codeableconcept
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import money
diff --git a/fhirclient/models/paymentreconciliation.py b/fhirclient/models/paymentreconciliation.py
index c1152eb43..86b52e9b5 100644
--- a/fhirclient/models/paymentreconciliation.py
+++ b/fhirclient/models/paymentreconciliation.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/PaymentReconciliation) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -220,28 +217,9 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import money
-except ImportError:
-    money = sys.modules[__package__ + '.money']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
+from . import codeableconcept
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import money
+from . import period
diff --git a/fhirclient/models/period.py b/fhirclient/models/period.py
index 52aa5cf9a..93f37cde0 100644
--- a/fhirclient/models/period.py
+++ b/fhirclient/models/period.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Period) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -42,8 +39,4 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
+from . import fhirdate
diff --git a/fhirclient/models/person.py b/fhirclient/models/person.py
index 3897f8993..1e54640d6 100644
--- a/fhirclient/models/person.py
+++ b/fhirclient/models/person.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Person) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -118,32 +115,10 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import address
-except ImportError:
-    address = sys.modules[__package__ + '.address']
-try:
-    from . import attachment
-except ImportError:
-    attachment = sys.modules[__package__ + '.attachment']
-try:
-    from . import contactpoint
-except ImportError:
-    contactpoint = sys.modules[__package__ + '.contactpoint']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import humanname
-except ImportError:
-    humanname = sys.modules[__package__ + '.humanname']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
+from . import address
+from . import attachment
+from . import contactpoint
+from . import fhirdate
+from . import fhirreference
+from . import humanname
+from . import identifier
diff --git a/fhirclient/models/plandefinition.py b/fhirclient/models/plandefinition.py
index 4c95c9678..4bc7af21c 100644
--- a/fhirclient/models/plandefinition.py
+++ b/fhirclient/models/plandefinition.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/PlanDefinition) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -665,68 +662,19 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import age
-except ImportError:
-    age = sys.modules[__package__ + '.age']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import contactdetail
-except ImportError:
-    contactdetail = sys.modules[__package__ + '.contactdetail']
-try:
-    from . import datarequirement
-except ImportError:
-    datarequirement = sys.modules[__package__ + '.datarequirement']
-try:
-    from . import duration
-except ImportError:
-    duration = sys.modules[__package__ + '.duration']
-try:
-    from . import expression
-except ImportError:
-    expression = sys.modules[__package__ + '.expression']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
-try:
-    from . import quantity
-except ImportError:
-    quantity = sys.modules[__package__ + '.quantity']
-try:
-    from . import range
-except ImportError:
-    range = sys.modules[__package__ + '.range']
-try:
-    from . import relatedartifact
-except ImportError:
-    relatedartifact = sys.modules[__package__ + '.relatedartifact']
-try:
-    from . import timing
-except ImportError:
-    timing = sys.modules[__package__ + '.timing']
-try:
-    from . import triggerdefinition
-except ImportError:
-    triggerdefinition = sys.modules[__package__ + '.triggerdefinition']
-try:
-    from . import usagecontext
-except ImportError:
-    usagecontext = sys.modules[__package__ + '.usagecontext']
+from . import age
+from . import codeableconcept
+from . import contactdetail
+from . import datarequirement
+from . import duration
+from . import expression
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import period
+from . import quantity
+from . import range
+from . import relatedartifact
+from . import timing
+from . import triggerdefinition
+from . import usagecontext
diff --git a/fhirclient/models/population.py b/fhirclient/models/population.py
index 1f14f24f2..2b432d99c 100644
--- a/fhirclient/models/population.py
+++ b/fhirclient/models/population.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Population) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -59,12 +56,5 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import range
-except ImportError:
-    range = sys.modules[__package__ + '.range']
+from . import codeableconcept
+from . import range
diff --git a/fhirclient/models/practitioner.py b/fhirclient/models/practitioner.py
index 60f238999..b79f3d4e4 100644
--- a/fhirclient/models/practitioner.py
+++ b/fhirclient/models/practitioner.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Practitioner) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -136,40 +133,12 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import address
-except ImportError:
-    address = sys.modules[__package__ + '.address']
-try:
-    from . import attachment
-except ImportError:
-    attachment = sys.modules[__package__ + '.attachment']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import contactpoint
-except ImportError:
-    contactpoint = sys.modules[__package__ + '.contactpoint']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import humanname
-except ImportError:
-    humanname = sys.modules[__package__ + '.humanname']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
+from . import address
+from . import attachment
+from . import codeableconcept
+from . import contactpoint
+from . import fhirdate
+from . import fhirreference
+from . import humanname
+from . import identifier
+from . import period
diff --git a/fhirclient/models/practitionerrole.py b/fhirclient/models/practitionerrole.py
index 33b2dce98..32e754f9d 100644
--- a/fhirclient/models/practitionerrole.py
+++ b/fhirclient/models/practitionerrole.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/PractitionerRole) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -191,28 +188,9 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import contactpoint
-except ImportError:
-    contactpoint = sys.modules[__package__ + '.contactpoint']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
+from . import codeableconcept
+from . import contactpoint
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import period
diff --git a/fhirclient/models/procedure.py b/fhirclient/models/procedure.py
index 31355b73b..f9a949f60 100644
--- a/fhirclient/models/procedure.py
+++ b/fhirclient/models/procedure.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Procedure) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -274,36 +271,11 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import age
-except ImportError:
-    age = sys.modules[__package__ + '.age']
-try:
-    from . import annotation
-except ImportError:
-    annotation = sys.modules[__package__ + '.annotation']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
-try:
-    from . import range
-except ImportError:
-    range = sys.modules[__package__ + '.range']
+from . import age
+from . import annotation
+from . import codeableconcept
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import period
+from . import range
diff --git a/fhirclient/models/prodcharacteristic.py b/fhirclient/models/prodcharacteristic.py
index 9f1732ab0..dc04657bc 100644
--- a/fhirclient/models/prodcharacteristic.py
+++ b/fhirclient/models/prodcharacteristic.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/ProdCharacteristic) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -112,16 +109,6 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import attachment
-except ImportError:
-    attachment = sys.modules[__package__ + '.attachment']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import quantity
-except ImportError:
-    quantity = sys.modules[__package__ + '.quantity']
+from . import attachment
+from . import codeableconcept
+from . import quantity
diff --git a/fhirclient/models/productshelflife.py b/fhirclient/models/productshelflife.py
index 25813e177..b10ea48ae 100644
--- a/fhirclient/models/productshelflife.py
+++ b/fhirclient/models/productshelflife.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/ProductShelfLife) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -63,16 +60,6 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import quantity
-except ImportError:
-    quantity = sys.modules[__package__ + '.quantity']
+from . import codeableconcept
+from . import identifier
+from . import quantity
diff --git a/fhirclient/models/provenance.py b/fhirclient/models/provenance.py
index 2d47cc48c..248ecb2f9 100644
--- a/fhirclient/models/provenance.py
+++ b/fhirclient/models/provenance.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Provenance) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -182,24 +179,8 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
-try:
-    from . import signature
-except ImportError:
-    signature = sys.modules[__package__ + '.signature']
+from . import codeableconcept
+from . import fhirdate
+from . import fhirreference
+from . import period
+from . import signature
diff --git a/fhirclient/models/quantity.py b/fhirclient/models/quantity.py
index 427e1672d..069c5a7f7 100644
--- a/fhirclient/models/quantity.py
+++ b/fhirclient/models/quantity.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/MoneyQuantity) on 2024-07-15.
 #  2024, SMART Health IT.
 
diff --git a/fhirclient/models/questionnaire.py b/fhirclient/models/questionnaire.py
index df6a52378..95a18d815 100644
--- a/fhirclient/models/questionnaire.py
+++ b/fhirclient/models/questionnaire.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Questionnaire) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -487,44 +484,13 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import attachment
-except ImportError:
-    attachment = sys.modules[__package__ + '.attachment']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import coding
-except ImportError:
-    coding = sys.modules[__package__ + '.coding']
-try:
-    from . import contactdetail
-except ImportError:
-    contactdetail = sys.modules[__package__ + '.contactdetail']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
-try:
-    from . import quantity
-except ImportError:
-    quantity = sys.modules[__package__ + '.quantity']
-try:
-    from . import usagecontext
-except ImportError:
-    usagecontext = sys.modules[__package__ + '.usagecontext']
+from . import attachment
+from . import codeableconcept
+from . import coding
+from . import contactdetail
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import period
+from . import quantity
+from . import usagecontext
diff --git a/fhirclient/models/questionnaireresponse.py b/fhirclient/models/questionnaireresponse.py
index a716270f8..4b10bed6a 100644
--- a/fhirclient/models/questionnaireresponse.py
+++ b/fhirclient/models/questionnaireresponse.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/QuestionnaireResponse) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -232,28 +229,9 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import attachment
-except ImportError:
-    attachment = sys.modules[__package__ + '.attachment']
-try:
-    from . import coding
-except ImportError:
-    coding = sys.modules[__package__ + '.coding']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import quantity
-except ImportError:
-    quantity = sys.modules[__package__ + '.quantity']
+from . import attachment
+from . import coding
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import quantity
diff --git a/fhirclient/models/range.py b/fhirclient/models/range.py
index 50d9e90d9..09384d5ff 100644
--- a/fhirclient/models/range.py
+++ b/fhirclient/models/range.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Range) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -42,8 +39,4 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import quantity
-except ImportError:
-    quantity = sys.modules[__package__ + '.quantity']
+from . import quantity
diff --git a/fhirclient/models/ratio.py b/fhirclient/models/ratio.py
index 98f06799f..1915be5a4 100644
--- a/fhirclient/models/ratio.py
+++ b/fhirclient/models/ratio.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Ratio) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -43,8 +40,4 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import quantity
-except ImportError:
-    quantity = sys.modules[__package__ + '.quantity']
+from . import quantity
diff --git a/fhirclient/models/reference.py b/fhirclient/models/reference.py
index 1650d7960..8c7904bce 100644
--- a/fhirclient/models/reference.py
+++ b/fhirclient/models/reference.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Reference) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -50,8 +47,4 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
+from . import identifier
diff --git a/fhirclient/models/relatedartifact.py b/fhirclient/models/relatedartifact.py
index 6035f7869..4fa92f1fb 100644
--- a/fhirclient/models/relatedartifact.py
+++ b/fhirclient/models/relatedartifact.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/RelatedArtifact) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -69,8 +66,4 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import attachment
-except ImportError:
-    attachment = sys.modules[__package__ + '.attachment']
+from . import attachment
diff --git a/fhirclient/models/relatedperson.py b/fhirclient/models/relatedperson.py
index 88ba04a6b..f4510fa94 100644
--- a/fhirclient/models/relatedperson.py
+++ b/fhirclient/models/relatedperson.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/RelatedPerson) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -132,40 +129,12 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import address
-except ImportError:
-    address = sys.modules[__package__ + '.address']
-try:
-    from . import attachment
-except ImportError:
-    attachment = sys.modules[__package__ + '.attachment']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import contactpoint
-except ImportError:
-    contactpoint = sys.modules[__package__ + '.contactpoint']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import humanname
-except ImportError:
-    humanname = sys.modules[__package__ + '.humanname']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
+from . import address
+from . import attachment
+from . import codeableconcept
+from . import contactpoint
+from . import fhirdate
+from . import fhirreference
+from . import humanname
+from . import identifier
+from . import period
diff --git a/fhirclient/models/requestgroup.py b/fhirclient/models/requestgroup.py
index 9effec3a5..c1a05af79 100644
--- a/fhirclient/models/requestgroup.py
+++ b/fhirclient/models/requestgroup.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/RequestGroup) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -356,52 +353,15 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import age
-except ImportError:
-    age = sys.modules[__package__ + '.age']
-try:
-    from . import annotation
-except ImportError:
-    annotation = sys.modules[__package__ + '.annotation']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import duration
-except ImportError:
-    duration = sys.modules[__package__ + '.duration']
-try:
-    from . import expression
-except ImportError:
-    expression = sys.modules[__package__ + '.expression']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
-try:
-    from . import range
-except ImportError:
-    range = sys.modules[__package__ + '.range']
-try:
-    from . import relatedartifact
-except ImportError:
-    relatedartifact = sys.modules[__package__ + '.relatedartifact']
-try:
-    from . import timing
-except ImportError:
-    timing = sys.modules[__package__ + '.timing']
+from . import age
+from . import annotation
+from . import codeableconcept
+from . import duration
+from . import expression
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import period
+from . import range
+from . import relatedartifact
+from . import timing
diff --git a/fhirclient/models/researchdefinition.py b/fhirclient/models/researchdefinition.py
index a6cf74fb1..e26f93640 100644
--- a/fhirclient/models/researchdefinition.py
+++ b/fhirclient/models/researchdefinition.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/ResearchDefinition) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -214,36 +211,11 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import contactdetail
-except ImportError:
-    contactdetail = sys.modules[__package__ + '.contactdetail']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
-try:
-    from . import relatedartifact
-except ImportError:
-    relatedartifact = sys.modules[__package__ + '.relatedartifact']
-try:
-    from . import usagecontext
-except ImportError:
-    usagecontext = sys.modules[__package__ + '.usagecontext']
+from . import codeableconcept
+from . import contactdetail
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import period
+from . import relatedartifact
+from . import usagecontext
diff --git a/fhirclient/models/researchelementdefinition.py b/fhirclient/models/researchelementdefinition.py
index 29ce9a9a6..875b73265 100644
--- a/fhirclient/models/researchelementdefinition.py
+++ b/fhirclient/models/researchelementdefinition.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/ResearchElementDefinition) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -343,52 +340,15 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import contactdetail
-except ImportError:
-    contactdetail = sys.modules[__package__ + '.contactdetail']
-try:
-    from . import datarequirement
-except ImportError:
-    datarequirement = sys.modules[__package__ + '.datarequirement']
-try:
-    from . import duration
-except ImportError:
-    duration = sys.modules[__package__ + '.duration']
-try:
-    from . import expression
-except ImportError:
-    expression = sys.modules[__package__ + '.expression']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
-try:
-    from . import relatedartifact
-except ImportError:
-    relatedartifact = sys.modules[__package__ + '.relatedartifact']
-try:
-    from . import timing
-except ImportError:
-    timing = sys.modules[__package__ + '.timing']
-try:
-    from . import usagecontext
-except ImportError:
-    usagecontext = sys.modules[__package__ + '.usagecontext']
+from . import codeableconcept
+from . import contactdetail
+from . import datarequirement
+from . import duration
+from . import expression
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import period
+from . import relatedartifact
+from . import timing
+from . import usagecontext
diff --git a/fhirclient/models/researchstudy.py b/fhirclient/models/researchstudy.py
index 27dcdd1c4..1105b73a6 100644
--- a/fhirclient/models/researchstudy.py
+++ b/fhirclient/models/researchstudy.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/ResearchStudy) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -244,32 +241,10 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import annotation
-except ImportError:
-    annotation = sys.modules[__package__ + '.annotation']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import contactdetail
-except ImportError:
-    contactdetail = sys.modules[__package__ + '.contactdetail']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
-try:
-    from . import relatedartifact
-except ImportError:
-    relatedartifact = sys.modules[__package__ + '.relatedartifact']
+from . import annotation
+from . import codeableconcept
+from . import contactdetail
+from . import fhirreference
+from . import identifier
+from . import period
+from . import relatedartifact
diff --git a/fhirclient/models/researchsubject.py b/fhirclient/models/researchsubject.py
index 84fb231e2..d85fa0076 100644
--- a/fhirclient/models/researchsubject.py
+++ b/fhirclient/models/researchsubject.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/ResearchSubject) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -75,16 +72,6 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
+from . import fhirreference
+from . import identifier
+from . import period
diff --git a/fhirclient/models/resource.py b/fhirclient/models/resource.py
index 8288ec9e6..05e8ca7a2 100644
--- a/fhirclient/models/resource.py
+++ b/fhirclient/models/resource.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Resource) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -52,8 +49,4 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import meta
-except ImportError:
-    meta = sys.modules[__package__ + '.meta']
+from . import meta
diff --git a/fhirclient/models/riskassessment.py b/fhirclient/models/riskassessment.py
index a334579c6..a11479335 100644
--- a/fhirclient/models/riskassessment.py
+++ b/fhirclient/models/riskassessment.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/RiskAssessment) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -190,32 +187,10 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import annotation
-except ImportError:
-    annotation = sys.modules[__package__ + '.annotation']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
-try:
-    from . import range
-except ImportError:
-    range = sys.modules[__package__ + '.range']
+from . import annotation
+from . import codeableconcept
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import period
+from . import range
diff --git a/fhirclient/models/riskevidencesynthesis.py b/fhirclient/models/riskevidencesynthesis.py
index 1cbf42d65..2d881af0a 100644
--- a/fhirclient/models/riskevidencesynthesis.py
+++ b/fhirclient/models/riskevidencesynthesis.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/RiskEvidenceSynthesis) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -418,40 +415,12 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import annotation
-except ImportError:
-    annotation = sys.modules[__package__ + '.annotation']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import contactdetail
-except ImportError:
-    contactdetail = sys.modules[__package__ + '.contactdetail']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
-try:
-    from . import relatedartifact
-except ImportError:
-    relatedartifact = sys.modules[__package__ + '.relatedartifact']
-try:
-    from . import usagecontext
-except ImportError:
-    usagecontext = sys.modules[__package__ + '.usagecontext']
+from . import annotation
+from . import codeableconcept
+from . import contactdetail
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import period
+from . import relatedartifact
+from . import usagecontext
diff --git a/fhirclient/models/sampleddata.py b/fhirclient/models/sampleddata.py
index 02b431f3f..5b6a2dd49 100644
--- a/fhirclient/models/sampleddata.py
+++ b/fhirclient/models/sampleddata.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/SampledData) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -68,8 +65,4 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import quantity
-except ImportError:
-    quantity = sys.modules[__package__ + '.quantity']
+from . import quantity
diff --git a/fhirclient/models/schedule.py b/fhirclient/models/schedule.py
index e3cbd1221..b7d269674 100644
--- a/fhirclient/models/schedule.py
+++ b/fhirclient/models/schedule.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Schedule) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -71,20 +68,7 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
+from . import codeableconcept
+from . import fhirreference
+from . import identifier
+from . import period
diff --git a/fhirclient/models/searchparameter.py b/fhirclient/models/searchparameter.py
index d882ad52b..aac3be364 100644
--- a/fhirclient/models/searchparameter.py
+++ b/fhirclient/models/searchparameter.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/SearchParameter) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -203,20 +200,7 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import contactdetail
-except ImportError:
-    contactdetail = sys.modules[__package__ + '.contactdetail']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import usagecontext
-except ImportError:
-    usagecontext = sys.modules[__package__ + '.usagecontext']
+from . import codeableconcept
+from . import contactdetail
+from . import fhirdate
+from . import usagecontext
diff --git a/fhirclient/models/servicerequest.py b/fhirclient/models/servicerequest.py
index 03f539d2c..e4e78e96e 100644
--- a/fhirclient/models/servicerequest.py
+++ b/fhirclient/models/servicerequest.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/ServiceRequest) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -225,44 +222,13 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import annotation
-except ImportError:
-    annotation = sys.modules[__package__ + '.annotation']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
-try:
-    from . import quantity
-except ImportError:
-    quantity = sys.modules[__package__ + '.quantity']
-try:
-    from . import range
-except ImportError:
-    range = sys.modules[__package__ + '.range']
-try:
-    from . import ratio
-except ImportError:
-    ratio = sys.modules[__package__ + '.ratio']
-try:
-    from . import timing
-except ImportError:
-    timing = sys.modules[__package__ + '.timing']
+from . import annotation
+from . import codeableconcept
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import period
+from . import quantity
+from . import range
+from . import ratio
+from . import timing
diff --git a/fhirclient/models/signature.py b/fhirclient/models/signature.py
index d651794ad..d27753f62 100644
--- a/fhirclient/models/signature.py
+++ b/fhirclient/models/signature.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Signature) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -71,16 +68,6 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import coding
-except ImportError:
-    coding = sys.modules[__package__ + '.coding']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
+from . import coding
+from . import fhirdate
+from . import fhirreference
diff --git a/fhirclient/models/slot.py b/fhirclient/models/slot.py
index c17e79ffd..413d334c5 100644
--- a/fhirclient/models/slot.py
+++ b/fhirclient/models/slot.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Slot) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -94,20 +91,7 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
+from . import codeableconcept
+from . import fhirdate
+from . import fhirreference
+from . import identifier
diff --git a/fhirclient/models/specimen.py b/fhirclient/models/specimen.py
index 7c2e6aa19..e0756c32c 100644
--- a/fhirclient/models/specimen.py
+++ b/fhirclient/models/specimen.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Specimen) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -282,36 +279,11 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import annotation
-except ImportError:
-    annotation = sys.modules[__package__ + '.annotation']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import duration
-except ImportError:
-    duration = sys.modules[__package__ + '.duration']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
-try:
-    from . import quantity
-except ImportError:
-    quantity = sys.modules[__package__ + '.quantity']
+from . import annotation
+from . import codeableconcept
+from . import duration
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import period
+from . import quantity
diff --git a/fhirclient/models/specimendefinition.py b/fhirclient/models/specimendefinition.py
index 7b201be3b..9221b79be 100644
--- a/fhirclient/models/specimendefinition.py
+++ b/fhirclient/models/specimendefinition.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/SpecimenDefinition) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -279,28 +276,9 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import duration
-except ImportError:
-    duration = sys.modules[__package__ + '.duration']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import quantity
-except ImportError:
-    quantity = sys.modules[__package__ + '.quantity']
-try:
-    from . import range
-except ImportError:
-    range = sys.modules[__package__ + '.range']
+from . import codeableconcept
+from . import duration
+from . import fhirreference
+from . import identifier
+from . import quantity
+from . import range
diff --git a/fhirclient/models/structuredefinition.py b/fhirclient/models/structuredefinition.py
index 0193b4de1..50bd0f91a 100644
--- a/fhirclient/models/structuredefinition.py
+++ b/fhirclient/models/structuredefinition.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/StructureDefinition) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -315,32 +312,10 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import coding
-except ImportError:
-    coding = sys.modules[__package__ + '.coding']
-try:
-    from . import contactdetail
-except ImportError:
-    contactdetail = sys.modules[__package__ + '.contactdetail']
-try:
-    from . import elementdefinition
-except ImportError:
-    elementdefinition = sys.modules[__package__ + '.elementdefinition']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import usagecontext
-except ImportError:
-    usagecontext = sys.modules[__package__ + '.usagecontext']
+from . import codeableconcept
+from . import coding
+from . import contactdetail
+from . import elementdefinition
+from . import fhirdate
+from . import identifier
+from . import usagecontext
diff --git a/fhirclient/models/structuremap.py b/fhirclient/models/structuremap.py
index 2bf0af663..7aacae93b 100644
--- a/fhirclient/models/structuremap.py
+++ b/fhirclient/models/structuremap.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/StructureMap) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -793,132 +790,35 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import address
-except ImportError:
-    address = sys.modules[__package__ + '.address']
-try:
-    from . import age
-except ImportError:
-    age = sys.modules[__package__ + '.age']
-try:
-    from . import annotation
-except ImportError:
-    annotation = sys.modules[__package__ + '.annotation']
-try:
-    from . import attachment
-except ImportError:
-    attachment = sys.modules[__package__ + '.attachment']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import coding
-except ImportError:
-    coding = sys.modules[__package__ + '.coding']
-try:
-    from . import contactdetail
-except ImportError:
-    contactdetail = sys.modules[__package__ + '.contactdetail']
-try:
-    from . import contactpoint
-except ImportError:
-    contactpoint = sys.modules[__package__ + '.contactpoint']
-try:
-    from . import contributor
-except ImportError:
-    contributor = sys.modules[__package__ + '.contributor']
-try:
-    from . import count
-except ImportError:
-    count = sys.modules[__package__ + '.count']
-try:
-    from . import datarequirement
-except ImportError:
-    datarequirement = sys.modules[__package__ + '.datarequirement']
-try:
-    from . import distance
-except ImportError:
-    distance = sys.modules[__package__ + '.distance']
-try:
-    from . import dosage
-except ImportError:
-    dosage = sys.modules[__package__ + '.dosage']
-try:
-    from . import duration
-except ImportError:
-    duration = sys.modules[__package__ + '.duration']
-try:
-    from . import expression
-except ImportError:
-    expression = sys.modules[__package__ + '.expression']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import humanname
-except ImportError:
-    humanname = sys.modules[__package__ + '.humanname']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import meta
-except ImportError:
-    meta = sys.modules[__package__ + '.meta']
-try:
-    from . import money
-except ImportError:
-    money = sys.modules[__package__ + '.money']
-try:
-    from . import parameterdefinition
-except ImportError:
-    parameterdefinition = sys.modules[__package__ + '.parameterdefinition']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
-try:
-    from . import quantity
-except ImportError:
-    quantity = sys.modules[__package__ + '.quantity']
-try:
-    from . import range
-except ImportError:
-    range = sys.modules[__package__ + '.range']
-try:
-    from . import ratio
-except ImportError:
-    ratio = sys.modules[__package__ + '.ratio']
-try:
-    from . import relatedartifact
-except ImportError:
-    relatedartifact = sys.modules[__package__ + '.relatedartifact']
-try:
-    from . import sampleddata
-except ImportError:
-    sampleddata = sys.modules[__package__ + '.sampleddata']
-try:
-    from . import signature
-except ImportError:
-    signature = sys.modules[__package__ + '.signature']
-try:
-    from . import timing
-except ImportError:
-    timing = sys.modules[__package__ + '.timing']
-try:
-    from . import triggerdefinition
-except ImportError:
-    triggerdefinition = sys.modules[__package__ + '.triggerdefinition']
-try:
-    from . import usagecontext
-except ImportError:
-    usagecontext = sys.modules[__package__ + '.usagecontext']
+from . import address
+from . import age
+from . import annotation
+from . import attachment
+from . import codeableconcept
+from . import coding
+from . import contactdetail
+from . import contactpoint
+from . import contributor
+from . import count
+from . import datarequirement
+from . import distance
+from . import dosage
+from . import duration
+from . import expression
+from . import fhirdate
+from . import fhirreference
+from . import humanname
+from . import identifier
+from . import meta
+from . import money
+from . import parameterdefinition
+from . import period
+from . import quantity
+from . import range
+from . import ratio
+from . import relatedartifact
+from . import sampleddata
+from . import signature
+from . import timing
+from . import triggerdefinition
+from . import usagecontext
diff --git a/fhirclient/models/subscription.py b/fhirclient/models/subscription.py
index 1444a3ada..e11865065 100644
--- a/fhirclient/models/subscription.py
+++ b/fhirclient/models/subscription.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Subscription) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -119,12 +116,5 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import contactpoint
-except ImportError:
-    contactpoint = sys.modules[__package__ + '.contactpoint']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
+from . import contactpoint
+from . import fhirdate
diff --git a/fhirclient/models/substance.py b/fhirclient/models/substance.py
index 4c6000018..57e911b48 100644
--- a/fhirclient/models/substance.py
+++ b/fhirclient/models/substance.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Substance) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -148,28 +145,9 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import quantity
-except ImportError:
-    quantity = sys.modules[__package__ + '.quantity']
-try:
-    from . import ratio
-except ImportError:
-    ratio = sys.modules[__package__ + '.ratio']
+from . import codeableconcept
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import quantity
+from . import ratio
diff --git a/fhirclient/models/substanceamount.py b/fhirclient/models/substanceamount.py
index 92f1ec83a..84f6702d7 100644
--- a/fhirclient/models/substanceamount.py
+++ b/fhirclient/models/substanceamount.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/SubstanceAmount) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -117,16 +114,6 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import quantity
-except ImportError:
-    quantity = sys.modules[__package__ + '.quantity']
-try:
-    from . import range
-except ImportError:
-    range = sys.modules[__package__ + '.range']
+from . import codeableconcept
+from . import quantity
+from . import range
diff --git a/fhirclient/models/substancenucleicacid.py b/fhirclient/models/substancenucleicacid.py
index 11eddb398..3fba20ea4 100644
--- a/fhirclient/models/substancenucleicacid.py
+++ b/fhirclient/models/substancenucleicacid.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/SubstanceNucleicAcid) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -241,16 +238,6 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import attachment
-except ImportError:
-    attachment = sys.modules[__package__ + '.attachment']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
+from . import attachment
+from . import codeableconcept
+from . import identifier
diff --git a/fhirclient/models/substancepolymer.py b/fhirclient/models/substancepolymer.py
index 213d32d17..97fe03b68 100644
--- a/fhirclient/models/substancepolymer.py
+++ b/fhirclient/models/substancepolymer.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/SubstancePolymer) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -300,16 +297,6 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import attachment
-except ImportError:
-    attachment = sys.modules[__package__ + '.attachment']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import substanceamount
-except ImportError:
-    substanceamount = sys.modules[__package__ + '.substanceamount']
+from . import attachment
+from . import codeableconcept
+from . import substanceamount
diff --git a/fhirclient/models/substanceprotein.py b/fhirclient/models/substanceprotein.py
index 41bed6c32..18113563c 100644
--- a/fhirclient/models/substanceprotein.py
+++ b/fhirclient/models/substanceprotein.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/SubstanceProtein) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -168,16 +165,6 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import attachment
-except ImportError:
-    attachment = sys.modules[__package__ + '.attachment']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
+from . import attachment
+from . import codeableconcept
+from . import identifier
diff --git a/fhirclient/models/substancereferenceinformation.py b/fhirclient/models/substancereferenceinformation.py
index 2ddff9f67..d995be27a 100644
--- a/fhirclient/models/substancereferenceinformation.py
+++ b/fhirclient/models/substancereferenceinformation.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/SubstanceReferenceInformation) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -249,24 +246,8 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import quantity
-except ImportError:
-    quantity = sys.modules[__package__ + '.quantity']
-try:
-    from . import range
-except ImportError:
-    range = sys.modules[__package__ + '.range']
+from . import codeableconcept
+from . import fhirreference
+from . import identifier
+from . import quantity
+from . import range
diff --git a/fhirclient/models/substancesourcematerial.py b/fhirclient/models/substancesourcematerial.py
index fa2db50ae..dff6b5872 100644
--- a/fhirclient/models/substancesourcematerial.py
+++ b/fhirclient/models/substancesourcematerial.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/SubstanceSourceMaterial) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -428,12 +425,5 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
+from . import codeableconcept
+from . import identifier
diff --git a/fhirclient/models/substancespecification.py b/fhirclient/models/substancespecification.py
index 747f2645f..aa2c9f48e 100644
--- a/fhirclient/models/substancespecification.py
+++ b/fhirclient/models/substancespecification.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/SubstanceSpecification) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -711,36 +708,11 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import attachment
-except ImportError:
-    attachment = sys.modules[__package__ + '.attachment']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import quantity
-except ImportError:
-    quantity = sys.modules[__package__ + '.quantity']
-try:
-    from . import range
-except ImportError:
-    range = sys.modules[__package__ + '.range']
-try:
-    from . import ratio
-except ImportError:
-    ratio = sys.modules[__package__ + '.ratio']
+from . import attachment
+from . import codeableconcept
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import quantity
+from . import range
+from . import ratio
diff --git a/fhirclient/models/supplydelivery.py b/fhirclient/models/supplydelivery.py
index 56e8b9b3b..f55d8ac5c 100644
--- a/fhirclient/models/supplydelivery.py
+++ b/fhirclient/models/supplydelivery.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/SupplyDelivery) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -139,32 +136,10 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
-try:
-    from . import quantity
-except ImportError:
-    quantity = sys.modules[__package__ + '.quantity']
-try:
-    from . import timing
-except ImportError:
-    timing = sys.modules[__package__ + '.timing']
+from . import codeableconcept
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import period
+from . import quantity
+from . import timing
diff --git a/fhirclient/models/supplyrequest.py b/fhirclient/models/supplyrequest.py
index 4cfbf7225..60ae511d0 100644
--- a/fhirclient/models/supplyrequest.py
+++ b/fhirclient/models/supplyrequest.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/SupplyRequest) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -176,36 +173,11 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
-try:
-    from . import quantity
-except ImportError:
-    quantity = sys.modules[__package__ + '.quantity']
-try:
-    from . import range
-except ImportError:
-    range = sys.modules[__package__ + '.range']
-try:
-    from . import timing
-except ImportError:
-    timing = sys.modules[__package__ + '.timing']
+from . import codeableconcept
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import period
+from . import quantity
+from . import range
+from . import timing
diff --git a/fhirclient/models/task.py b/fhirclient/models/task.py
index d0f0bb3d7..423bb751e 100644
--- a/fhirclient/models/task.py
+++ b/fhirclient/models/task.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Task) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -790,132 +787,35 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import address
-except ImportError:
-    address = sys.modules[__package__ + '.address']
-try:
-    from . import age
-except ImportError:
-    age = sys.modules[__package__ + '.age']
-try:
-    from . import annotation
-except ImportError:
-    annotation = sys.modules[__package__ + '.annotation']
-try:
-    from . import attachment
-except ImportError:
-    attachment = sys.modules[__package__ + '.attachment']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import coding
-except ImportError:
-    coding = sys.modules[__package__ + '.coding']
-try:
-    from . import contactdetail
-except ImportError:
-    contactdetail = sys.modules[__package__ + '.contactdetail']
-try:
-    from . import contactpoint
-except ImportError:
-    contactpoint = sys.modules[__package__ + '.contactpoint']
-try:
-    from . import contributor
-except ImportError:
-    contributor = sys.modules[__package__ + '.contributor']
-try:
-    from . import count
-except ImportError:
-    count = sys.modules[__package__ + '.count']
-try:
-    from . import datarequirement
-except ImportError:
-    datarequirement = sys.modules[__package__ + '.datarequirement']
-try:
-    from . import distance
-except ImportError:
-    distance = sys.modules[__package__ + '.distance']
-try:
-    from . import dosage
-except ImportError:
-    dosage = sys.modules[__package__ + '.dosage']
-try:
-    from . import duration
-except ImportError:
-    duration = sys.modules[__package__ + '.duration']
-try:
-    from . import expression
-except ImportError:
-    expression = sys.modules[__package__ + '.expression']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import humanname
-except ImportError:
-    humanname = sys.modules[__package__ + '.humanname']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import meta
-except ImportError:
-    meta = sys.modules[__package__ + '.meta']
-try:
-    from . import money
-except ImportError:
-    money = sys.modules[__package__ + '.money']
-try:
-    from . import parameterdefinition
-except ImportError:
-    parameterdefinition = sys.modules[__package__ + '.parameterdefinition']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
-try:
-    from . import quantity
-except ImportError:
-    quantity = sys.modules[__package__ + '.quantity']
-try:
-    from . import range
-except ImportError:
-    range = sys.modules[__package__ + '.range']
-try:
-    from . import ratio
-except ImportError:
-    ratio = sys.modules[__package__ + '.ratio']
-try:
-    from . import relatedartifact
-except ImportError:
-    relatedartifact = sys.modules[__package__ + '.relatedartifact']
-try:
-    from . import sampleddata
-except ImportError:
-    sampleddata = sys.modules[__package__ + '.sampleddata']
-try:
-    from . import signature
-except ImportError:
-    signature = sys.modules[__package__ + '.signature']
-try:
-    from . import timing
-except ImportError:
-    timing = sys.modules[__package__ + '.timing']
-try:
-    from . import triggerdefinition
-except ImportError:
-    triggerdefinition = sys.modules[__package__ + '.triggerdefinition']
-try:
-    from . import usagecontext
-except ImportError:
-    usagecontext = sys.modules[__package__ + '.usagecontext']
+from . import address
+from . import age
+from . import annotation
+from . import attachment
+from . import codeableconcept
+from . import coding
+from . import contactdetail
+from . import contactpoint
+from . import contributor
+from . import count
+from . import datarequirement
+from . import distance
+from . import dosage
+from . import duration
+from . import expression
+from . import fhirdate
+from . import fhirreference
+from . import humanname
+from . import identifier
+from . import meta
+from . import money
+from . import parameterdefinition
+from . import period
+from . import quantity
+from . import range
+from . import ratio
+from . import relatedartifact
+from . import sampleddata
+from . import signature
+from . import timing
+from . import triggerdefinition
+from . import usagecontext
diff --git a/fhirclient/models/terminologycapabilities.py b/fhirclient/models/terminologycapabilities.py
index a60058f95..dfd8a61fc 100644
--- a/fhirclient/models/terminologycapabilities.py
+++ b/fhirclient/models/terminologycapabilities.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/TerminologyCapabilities) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -537,20 +534,7 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import contactdetail
-except ImportError:
-    contactdetail = sys.modules[__package__ + '.contactdetail']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import usagecontext
-except ImportError:
-    usagecontext = sys.modules[__package__ + '.usagecontext']
+from . import codeableconcept
+from . import contactdetail
+from . import fhirdate
+from . import usagecontext
diff --git a/fhirclient/models/testreport.py b/fhirclient/models/testreport.py
index bf3723fee..bda471ea4 100644
--- a/fhirclient/models/testreport.py
+++ b/fhirclient/models/testreport.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/TestReport) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -416,16 +413,6 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
+from . import fhirdate
+from . import fhirreference
+from . import identifier
diff --git a/fhirclient/models/testscript.py b/fhirclient/models/testscript.py
index 73cc28607..c5a5fdb33 100644
--- a/fhirclient/models/testscript.py
+++ b/fhirclient/models/testscript.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/TestScript) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -958,32 +955,10 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import coding
-except ImportError:
-    coding = sys.modules[__package__ + '.coding']
-try:
-    from . import contactdetail
-except ImportError:
-    contactdetail = sys.modules[__package__ + '.contactdetail']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import usagecontext
-except ImportError:
-    usagecontext = sys.modules[__package__ + '.usagecontext']
+from . import codeableconcept
+from . import coding
+from . import contactdetail
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import usagecontext
diff --git a/fhirclient/models/timing.py b/fhirclient/models/timing.py
index dd94d17d1..cd81c0ac1 100644
--- a/fhirclient/models/timing.py
+++ b/fhirclient/models/timing.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/Timing) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -163,24 +160,8 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import duration
-except ImportError:
-    duration = sys.modules[__package__ + '.duration']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import period
-except ImportError:
-    period = sys.modules[__package__ + '.period']
-try:
-    from . import range
-except ImportError:
-    range = sys.modules[__package__ + '.range']
+from . import codeableconcept
+from . import duration
+from . import fhirdate
+from . import period
+from . import range
diff --git a/fhirclient/models/triggerdefinition.py b/fhirclient/models/triggerdefinition.py
index 8b0d25c55..937b9b47d 100644
--- a/fhirclient/models/triggerdefinition.py
+++ b/fhirclient/models/triggerdefinition.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/TriggerDefinition) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -74,24 +71,8 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import datarequirement
-except ImportError:
-    datarequirement = sys.modules[__package__ + '.datarequirement']
-try:
-    from . import expression
-except ImportError:
-    expression = sys.modules[__package__ + '.expression']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import timing
-except ImportError:
-    timing = sys.modules[__package__ + '.timing']
+from . import datarequirement
+from . import expression
+from . import fhirdate
+from . import fhirreference
+from . import timing
diff --git a/fhirclient/models/usagecontext.py b/fhirclient/models/usagecontext.py
index 8fc103ab4..9df107cb1 100644
--- a/fhirclient/models/usagecontext.py
+++ b/fhirclient/models/usagecontext.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/UsageContext) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -60,24 +57,8 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import coding
-except ImportError:
-    coding = sys.modules[__package__ + '.coding']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import quantity
-except ImportError:
-    quantity = sys.modules[__package__ + '.quantity']
-try:
-    from . import range
-except ImportError:
-    range = sys.modules[__package__ + '.range']
+from . import codeableconcept
+from . import coding
+from . import fhirreference
+from . import quantity
+from . import range
diff --git a/fhirclient/models/valueset.py b/fhirclient/models/valueset.py
index 204c23d39..297930ebd 100644
--- a/fhirclient/models/valueset.py
+++ b/fhirclient/models/valueset.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/ValueSet) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -539,28 +536,9 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import coding
-except ImportError:
-    coding = sys.modules[__package__ + '.coding']
-try:
-    from . import contactdetail
-except ImportError:
-    contactdetail = sys.modules[__package__ + '.contactdetail']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import usagecontext
-except ImportError:
-    usagecontext = sys.modules[__package__ + '.usagecontext']
+from . import codeableconcept
+from . import coding
+from . import contactdetail
+from . import fhirdate
+from . import identifier
+from . import usagecontext
diff --git a/fhirclient/models/verificationresult.py b/fhirclient/models/verificationresult.py
index b5aa4c5aa..e735dbec9 100644
--- a/fhirclient/models/verificationresult.py
+++ b/fhirclient/models/verificationresult.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/VerificationResult) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -272,24 +269,8 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import signature
-except ImportError:
-    signature = sys.modules[__package__ + '.signature']
-try:
-    from . import timing
-except ImportError:
-    timing = sys.modules[__package__ + '.timing']
+from . import codeableconcept
+from . import fhirdate
+from . import fhirreference
+from . import signature
+from . import timing
diff --git a/fhirclient/models/visionprescription.py b/fhirclient/models/visionprescription.py
index 110103e53..64fd78ea7 100644
--- a/fhirclient/models/visionprescription.py
+++ b/fhirclient/models/visionprescription.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
 #  Generated from FHIR 4.0.1-9346c8cc45 (http://hl7.org/fhir/StructureDefinition/VisionPrescription) on 2024-07-15.
 #  2024, SMART Health IT.
 
@@ -206,28 +203,9 @@ def elementProperties(self):
         return js
 
 
-import sys
-try:
-    from . import annotation
-except ImportError:
-    annotation = sys.modules[__package__ + '.annotation']
-try:
-    from . import codeableconcept
-except ImportError:
-    codeableconcept = sys.modules[__package__ + '.codeableconcept']
-try:
-    from . import fhirdate
-except ImportError:
-    fhirdate = sys.modules[__package__ + '.fhirdate']
-try:
-    from . import fhirreference
-except ImportError:
-    fhirreference = sys.modules[__package__ + '.fhirreference']
-try:
-    from . import identifier
-except ImportError:
-    identifier = sys.modules[__package__ + '.identifier']
-try:
-    from . import quantity
-except ImportError:
-    quantity = sys.modules[__package__ + '.quantity']
+from . import annotation
+from . import codeableconcept
+from . import fhirdate
+from . import fhirreference
+from . import identifier
+from . import quantity
diff --git a/fhirclient/server.py b/fhirclient/server.py
index c1c899a97..17d728897 100644
--- a/fhirclient/server.py
+++ b/fhirclient/server.py
@@ -1,15 +1,9 @@
-# -*- coding: utf-8 -*-
-
 import json
 import requests
-import urllib
 import logging
-try:                                # Python 2.x
-    import urlparse
-except ImportError as e:            # Python 3
-    import urllib.parse as urlparse
+import urllib.parse as urlparse
 
-from auth import FHIRAuth
+from .auth import FHIRAuth
 
 FHIRJSONMimeType = 'application/fhir+json'
 
@@ -80,7 +74,7 @@ def get_capability(self, force=False):
         """
         if self._capability is None or force:
             logger.info('Fetching CapabilityStatement from {0}'.format(self.base_uri))
-            from models import capabilitystatement
+            from .models import capabilitystatement
             conf = capabilitystatement.CapabilityStatement.read_from('metadata', self)
             self._capability = conf
             
diff --git a/setup.py b/setup.py
index 7d299042f..b59bc5141 100644
--- a/setup.py
+++ b/setup.py
@@ -37,6 +37,7 @@ def find_version(*file_paths):
     author="SMART Platforms Team",
     author_email='support@smarthealthit.org',
     packages=find_packages(exclude=['tests*']),
+    python_requires='>= 3.8',
     install_requires=['requests', 'isodate'],
     classifiers=[
         'Development Status :: 4 - Beta',
diff --git a/tests/client_test.py b/tests/client_test.py
new file mode 100644
index 000000000..be1315631
--- /dev/null
+++ b/tests/client_test.py
@@ -0,0 +1,41 @@
+import unittest
+
+from fhirclient.client import FHIRClient
+
+
+class TestClient(unittest.TestCase):
+
+    def test_load_from_state(self):
+        state = {
+            'app_id': 'AppID',
+            'app_secret': 'AppSecret',
+            'scope': 'user/*.read',
+            'redirect': 'http://test.invalid/redirect',
+            'patient_id': 'PatientID',
+            'server': {
+                'base_uri': 'http://test.invalid/',
+                'auth_type': 'none',
+                'auth': {
+                    'app_id': 'AppId',
+                },
+            },
+            'launch_token': 'LaunchToken',
+            'launch_context': {
+                'encounter': 'EncounterID',
+                'patient': 'PatientID',
+            },
+            'jwt_token': 'JwtToken',
+        }
+
+        # Confirm round trip
+        client = FHIRClient(state=state)
+        self.assertEqual(state, client.state)
+
+        # Sanity check a couple of the properties actually got set
+        self.assertEqual('AppID', client.app_id)
+        self.assertEqual('LaunchToken', client.launch_token)
+
+        # Confirm we can do a partial from_state() - well, kind of partial since server is required
+        client.from_state({'app_id': 'NewID', 'server': state['server']})
+        self.assertEqual('NewID', client.app_id)
+        self.assertEqual('LaunchToken', client.launch_token)