diff --git a/input/fsh/profiles/ImmunizationUvIps.fsh b/input/fsh/profiles/ImmunizationUvIps.fsh
index 4596d92e..b2d8f019 100644
--- a/input/fsh/profiles/ImmunizationUvIps.fsh
+++ b/input/fsh/profiles/ImmunizationUvIps.fsh
@@ -20,15 +20,6 @@ It describes the event of a patient being administered a vaccination or a record
 * vaccineCode from VaccinesUvIps (preferred)
 * vaccineCode ^short = "Vaccine that was administered or was to be administered.Several kinds of vaccine product coding could be provided.\r\n\r\n     The IPS assumes that either the type of the vaccine for particular disease or diseases (e.g. MMR vaccine) against which the patient has been immunised is provided; or the known absent / unknown code.\r\n\r\n     Other coded information can be provided as well as: the IDMP Pharmaceutical Product Identifiers (PhPID), Medicinal Product Identifier (MPID), Packaged Medicinal Product Identifier (PCID), when available, or equivalent coded concepts; the WHO ATC codes; or any other kind of code that that identifies, classifies or cluster the administered product."
 * vaccineCode ^definition = "Vaccine that was administered or was to be administered. Several kinds of vaccine product coding could be provided.\r\nThe IPS assumes that either the type of the vaccine for particular disease or diseases (e.g. MMR vaccine) against which the patient has been immunized is provided; or the known absent / unknown.\r\n\r\nOther coded information can be provided as well as:\r\n\r\n- The IDMP Pharmaceutical Product Identifier (PhPID), Level 1, [Substance(s)]. Example: Amoxicillin and Clavulanate Potassium; or any other equivalent coded concept.\r\n- The IDMP Pharmaceutical Product Identifier (PhPID), Level 2 [Substance(s) + Strength + reference strength]. Example: Amoxicillin 875 mg and Clavulanate Potassium 125 mg; or any other equivalent coded concept.\r\n- The IDMP Pharmaceutical Product Identifier (PhPID), Level 3 [Substance(s) + administrable dose form]. Example: Amoxicillin and Clavulanate Potassium, Oral Tablet; or any other equivalent coded concept.\r\n- The IDMP Pharmaceutical Product Identifier (PhPID), Level 4 [Substance(s) + strength + reference strength + administrable dose form]. Example: Amoxicillin 875 mg and clavulanate potassium 125 mg, oral tablet; or any other equivalent coded concept.\r\n- The IDMP Medicinal Product Identifier (MPID) or any equivalent Medicinal Product Identifier. IDMP MPID uniquely identifies a Medicinal Product, reflecting (but not replacing) any other authorization numbers allocated by a regulator. MPID implies one (set of) PhPID. The MPID shall use a common segment pattern related to a Medicinal Product, which, when each segment is valued shall define a specific MPID concept.\r\n- The IDMP Packaged Medicinal Product Identifier (PCID) or any equivalent Packaged Medicinal Product Identifier. Uniquely identifies a Medicinal Product based on its packaging. This implies one MPID can be associated with more than one PCID, if the same Medicinal Product has more than one type of package.\r\n- Any other kind of code that that identifies, classifies or clusters the administered product (e.g. the medicinal product or the product class).\r\n\r\nThe value sets used for the PhPID, MPID and PCID identifiers are provisional and include only few equivalent concepts used for exemplification purposes, they will be updated with real IDMP identifiers when they will become available."
-* vaccineCode ^binding.extension[0].extension[0].url = "purpose"
-* vaccineCode ^binding.extension[=].extension[=].valueCode = #candidate
-* vaccineCode ^binding.extension[=].extension[+].url = "valueSet"
-* vaccineCode ^binding.extension[=].extension[=].valueCanonical = "http://hl7.org/fhir/uv/ips/ValueSet/vaccines-snomed-ct-ips-free-set"
-* vaccineCode ^binding.extension[=].extension[+].url = "documentation"
-* vaccineCode ^binding.extension[=].extension[=].valueMarkdown = "Additional conformance binding to a vaccines value set from the SNOMED CT IPS free set for use globally (in SNOMED member and non-member jurisdictions)."
-* vaccineCode ^binding.extension[=].extension[+].url = "shortDoco"
-* vaccineCode ^binding.extension[=].extension[=].valueString = "For when codes from the SNOMED CT IPS free set are preferred"
-* vaccineCode ^binding.extension[=].url = "http://hl7.org/fhir/tools/StructureDefinition/additional-binding"
 * vaccineCode ^binding.extension[+].extension[0].url = "purpose"
 * vaccineCode ^binding.extension[=].extension[=].valueCode = #candidate
 * vaccineCode ^binding.extension[=].extension[+].url = "valueSet"
@@ -57,11 +48,4 @@ It describes the event of a patient being administered a vaccination or a record
 * protocolApplied.targetDisease from VaccineTargetDiseasesUvIps (preferred)
 * protocolApplied.targetDisease ^short = "Vaccine preventable disease being targeted"
 * protocolApplied.targetDisease ^definition = "The particular disease against which the patient has been immunized.\r\n\r\nAdditional conformance bindings provided for use for this element in specific (jurisdictional or other) contexts include (these bindings are represented in the StructureDefinition as instances of the [elementdefinition-additionalBinding](http://hl7.org/fhir/tools/StructureDefinition/additional-binding) extension):\r\n- [targetDiseases-uv-ips](./ValueSet-target-diseases-uv-ips.html)"
-* protocolApplied.targetDisease ^binding.extension[0].extension[0].url = "purpose"
-* protocolApplied.targetDisease ^binding.extension[=].extension[=].valueCode = #candidate
-* protocolApplied.targetDisease ^binding.extension[=].extension[+].url = "valueSet"
-* protocolApplied.targetDisease ^binding.extension[=].extension[=].valueCanonical = "http://hl7.org/fhir/uv/ips/ValueSet/target-diseases-snomed-ct-ips-free-set"
-* protocolApplied.targetDisease ^binding.extension[=].extension[+].url = "documentation"
-* protocolApplied.targetDisease ^binding.extension[=].extension[=].valueMarkdown = "Additional conformance binding to a target diseases value set from the SNOMED CT IPS free set for use globally (in SNOMED member and non-member jurisdictions)."
-* protocolApplied.targetDisease ^binding.extension[=].url = "http://hl7.org/fhir/tools/StructureDefinition/additional-binding"
 * protocolApplied.targetDisease ^binding.description = "The particular disease or diseases against which the patient has been immunized."
\ No newline at end of file
diff --git a/input/fsh/profiles/ObservationResultsRadiologyUvIps.fsh b/input/fsh/profiles/ObservationResultsRadiologyUvIps.fsh
index ce4b6a8e..fa310c0d 100644
--- a/input/fsh/profiles/ObservationResultsRadiologyUvIps.fsh
+++ b/input/fsh/profiles/ObservationResultsRadiologyUvIps.fsh
@@ -72,7 +72,7 @@ It allows also providing details about the related study using the partOf elemen
     numericSampledDataMeasurement 0..*
 * component[observationText] ^short = "Observation Text"
 * component[observationText].code only CodeableConceptIPS
-* component[observationText].code from ResultsRadiologyTextualObservationsSnomedDicomLoincUvIps (extensible)
+* component[observationText].code from ResultsRadiologyTextualObservationUvIps (extensible)
 * component[observationText].code ^binding.extension.url = "http://hl7.org/fhir/StructureDefinition/elementdefinition-bindingName"
 * component[observationText].code ^binding.extension.valueString = "ObservationCode"
 * component[observationText].value[x] 1..
diff --git a/input/fsh/valuesets/MedicalDevicesUvIps.fsh b/input/fsh/valuesets/MedicalDevicesUvIps.fsh
index 31aeeb9d..0621acc6 100644
--- a/input/fsh/valuesets/MedicalDevicesUvIps.fsh
+++ b/input/fsh/valuesets/MedicalDevicesUvIps.fsh
@@ -2,7 +2,7 @@ ValueSet: MedicalDevicesUvIps
 Id: medical-devices-uv-ips
 Title: "Medical Devices - IPS"
 Description: """
-IPS Medical device codes value set.  This value set includes codes from SNOMED Clinical Terms (SNOMED CT®) that are included in: all descendants of 49062001 \|Device (physical object)\|; all descendants or self of 787483001 \|No known device use (situation)\|
+IPS Medical device codes value set.  This value set includes codes from SNOMED CT (SNOMED CT®) that are included in: all descendants of 49062001 \|Device (physical object)\|; all descendants or self of 787483001 \|No known device use (situation)\|
 
 SNOMED CT® ECL definition:\
 < 49062001 \|Device (physical object)\| OR \<\< 787483001 \|No known device use (situation)\|
diff --git a/input/fsh/valuesets/MedicineActiveSubstancesUvIps.fsh b/input/fsh/valuesets/MedicineActiveSubstancesUvIps.fsh
index bd40e9a5..5c19074f 100644
--- a/input/fsh/valuesets/MedicineActiveSubstancesUvIps.fsh
+++ b/input/fsh/valuesets/MedicineActiveSubstancesUvIps.fsh
@@ -2,7 +2,7 @@ ValueSet: MedicineActiveSubstancesUvIps
 Id: medicine-active-substances-uv-ips
 Title: "Medicine Active Substances - IPS"
 Description: """
-IPS Medicine active substance codes value set.  This value set includes codes from SNOMED Clinical Terms®: all descendants of 410942007 \|Drug or medicament (substance)\|
+IPS Medicine active substance codes value set.  This value set includes codes from SNOMED CT®: all descendants of 410942007 \|Drug or medicament (substance)\|
 
 SNOMED CT® ECL definition:\
 < 410942007 \|Drug or medicament (substance)\|\
diff --git a/input/fsh/valuesets/ProceduresUvIps.fsh b/input/fsh/valuesets/ProceduresUvIps.fsh
index 70d8d7a8..552bd489 100644
--- a/input/fsh/valuesets/ProceduresUvIps.fsh
+++ b/input/fsh/valuesets/ProceduresUvIps.fsh
@@ -2,7 +2,7 @@ ValueSet: ProceduresUvIps
 Id: procedures-uv-ips
 Title: "Procedures - IPS"
 Description: """
-IPS Procedure codes value set.  This value set includes codes from SNOMED Clinical Terms®: all descendants of 71388002 \|Procedure (procedure)\|; excluding [all descendants or self of 14734007 \|Administrative procedure (procedure)\|; all descendants or self of 59524001 \|Blood bank procedure (procedure)\|; all descendants or self of 389067005 \|Community health procedure (procedure)\|; all descendants or self of 442006003 \|Determination of information related to transfusion (procedure)\|; all descendants or self of 225288009 \|Environmental care procedure (procedure)\|; all descendants or self of 308335008 \|Patient encounter procedure (procedure)\|; all descendants or self of 710135002 \|Promotion (procedure)\|; all descendants or self of 389084004 \|Staff related procedure (procedure)\|]; including all descendants or self of 787480003 \|No known procedures (situation)\|
+IPS Procedure codes value set.  This value set includes codes from SNOMED CT®: all descendants of 71388002 \|Procedure (procedure)\|; excluding [all descendants or self of 14734007 \|Administrative procedure (procedure)\|; all descendants or self of 59524001 \|Blood bank procedure (procedure)\|; all descendants or self of 389067005 \|Community health procedure (procedure)\|; all descendants or self of 442006003 \|Determination of information related to transfusion (procedure)\|; all descendants or self of 225288009 \|Environmental care procedure (procedure)\|; all descendants or self of 308335008 \|Patient encounter procedure (procedure)\|; all descendants or self of 710135002 \|Promotion (procedure)\|; all descendants or self of 389084004 \|Staff related procedure (procedure)\|]; including all descendants or self of 787480003 \|No known procedures (situation)\|
 
 SNOMED CT® ECL definition:\
 (< 71388002 \|Procedure (procedure)\| MINUS (\<\< 14734007 \|Administrative procedure (procedure)\| OR \<\< 59524001 \|Blood bank procedure (procedure)\| OR \<\< 389067005 \|Community health procedure (procedure)\| OR \<\< 442006003 \|Determination of information related to transfusion (procedure)\| OR \<\< 225288009 \|Environmental care procedure (procedure)\| OR \<\< 308335008 \|Patient encounter procedure (procedure)\| OR \<\< 710135002 \|Promotion (procedure)\| OR \<\< 389084004 \|Staff related procedure (procedure)\|)) OR << 787480003 \|No known procedures (situation)\|
diff --git a/input/fsh/valuesets/ResultsRadiologyTextualObservationsSnomedDicomLoincUvIps.fsh b/input/fsh/valuesets/ResultsRadiologyTextualObservationUvIps.fsh
similarity index 80%
rename from input/fsh/valuesets/ResultsRadiologyTextualObservationsSnomedDicomLoincUvIps.fsh
rename to input/fsh/valuesets/ResultsRadiologyTextualObservationUvIps.fsh
index 662a70c1..67021161 100644
--- a/input/fsh/valuesets/ResultsRadiologyTextualObservationsSnomedDicomLoincUvIps.fsh
+++ b/input/fsh/valuesets/ResultsRadiologyTextualObservationUvIps.fsh
@@ -1,12 +1,10 @@
-ValueSet: ResultsRadiologyTextualObservationsSnomedDicomLoincUvIps
-Id: results-radiology-txtobs-snomed-dicom-loinc-uv-ips
-Title: "Results Radiology Textual Observations (SNOMED-DICOM-LOINC) - IPS"
-Description: "IPS Results Radiology Textual Observations"
+ValueSet: ResultsRadiologyTextualObservationUvIps
+Id: results-radiology-txtobs-uv-ips
+Title: "Results Radiology Textual Observation - IPS"
+Description: "IPS Results Radiology Textual Observation"
 * ^meta.profile = "http://hl7.org/fhir/StructureDefinition/shareablevalueset"
-* ^version = "1.1.0"
 * ^status = #active
 * ^experimental = false
-* ^date = "2024-06-19T10:50:07-05:00"
 * ^publisher = "HL7 International / Patient Care"
 * ^contact.telecom.system = #url
 * ^contact.telecom.value = "http://www.hl7.org/Special/committees/patientcare"
diff --git a/input/fsh/valuesets/ResultsSpecimenTypeSnomedCtIpsFreeSet.fsh b/input/fsh/valuesets/ResultsSpecimenTypeSnomedCtIpsFreeSet.fsh
deleted file mode 100644
index c29a420c..00000000
--- a/input/fsh/valuesets/ResultsSpecimenTypeSnomedCtIpsFreeSet.fsh
+++ /dev/null
@@ -1,402 +0,0 @@
-ValueSet: ResultsSpecimenTypeSnomedCtIpsFreeSet
-Id: results-specimen-type-snomed-ct-ips-free-set
-Title: "Results Specimen Type - SNOMED CT IPS Free Set"
-Description: "This value set includes the codes from the SNOMED International Patient Set (IPS) subset of SNOMED CT (IPS Free Set) that are included in: all descendants of 123038009 \\|Specimen (specimen)\\|."
-* ^version = "1.1.0"
-* ^status = #active
-* ^experimental = false
-* ^date = "2022-08-20T13:24:58+00:00"
-* ^publisher = "HL7 International / Patient Care"
-* ^contact.telecom.system = #url
-* ^contact.telecom.value = "http://www.hl7.org/Special/committees/patientcare"
-* ^jurisdiction = $m49.htm#001
-* ^immutable = false
-* ^copyright = "The SNOMED International IPS Terminology is distributed by International Health Terminology Standards Development Organisation, trading as SNOMED International, and is subject the terms of the [Creative Commons Attribution 4.0 International Public License](https://creativecommons.org/licenses/by/4.0/). For more information, see [SNOMED IPS Terminology](https://www.snomed.org/snomed-ct/Other-SNOMED-products/international-patient-summary-terminology)"
-* ^expansion.timestamp = "2022-08-20T13:24:58+00:00"
-* ^expansion.total = 127
-* ^expansion.offset = 0
-* ^expansion.parameter.name = "version"
-* ^expansion.parameter.valueUri = "http://snomed.info/sct/version/20220731"
-* ^expansion.contains[0].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #708048008
-* ^expansion.contains[=].display = "Plasma specimen with citrate"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #702701006
-* ^expansion.contains[=].display = "Specimen from cervix or vagina"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #698276005
-* ^expansion.contains[=].display = "First stream urine specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #472896000
-* ^expansion.contains[=].display = "Swab from blister"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #472881004
-* ^expansion.contains[=].display = "Swab from pharynx"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #472867001
-* ^expansion.contains[=].display = "Swab from tonsil"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #446861007
-* ^expansion.contains[=].display = "Cerebrospinal fluid specimen obtained via ventriculoperitoneal shunt"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #446846006
-* ^expansion.contains[=].display = "Urine specimen obtained via indwelling urinary catheter"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #446562005
-* ^expansion.contains[=].display = "Body fluid specimen obtained via sump drain"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #446302006
-* ^expansion.contains[=].display = "Air specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #446272009
-* ^expansion.contains[=].display = "Blood specimen submitted in heparinized collection tube"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #440500007
-* ^expansion.contains[=].display = "Dried blood spot specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #440493002
-* ^expansion.contains[=].display = "Graft specimen from patient"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #440473005
-* ^expansion.contains[=].display = "Contact lens submitted as specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #440137008
-* ^expansion.contains[=].display = "Specimen obtained by peritoneal lavage"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #439961009
-* ^expansion.contains[=].display = "Implant submitted as specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #438660002
-* ^expansion.contains[=].display = "Specimen from prosthetic device"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #432825001
-* ^expansion.contains[=].display = "Body secretion specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #430268003
-* ^expansion.contains[=].display = "Specimen from bone"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #408654003
-* ^expansion.contains[=].display = "Specimen obtained by amputation"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #399713008
-* ^expansion.contains[=].display = "Specimen from uterine cervix obtained by cone biopsy"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #309502007
-* ^expansion.contains[=].display = "Fetus specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #309213006
-* ^expansion.contains[=].display = "Gastric brushings specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #309211008
-* ^expansion.contains[=].display = "Gastric biopsy specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #309210009
-* ^expansion.contains[=].display = "Esophageal brushings specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #309176002
-* ^expansion.contains[=].display = "Bronchial brushings specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #309166000
-* ^expansion.contains[=].display = "Ear swab specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #309075001
-* ^expansion.contains[=].display = "Skin cyst specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #309068002
-* ^expansion.contains[=].display = "Skin lesion specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #309067007
-* ^expansion.contains[=].display = "Specimen from skin obtained by curettage"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #309066003
-* ^expansion.contains[=].display = "Skin biopsy specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #309051001
-* ^expansion.contains[=].display = "Body fluid specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #309049000
-* ^expansion.contains[=].display = "Lesion specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #302795002
-* ^expansion.contains[=].display = "Lymph node aspirate"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #302794003
-* ^expansion.contains[=].display = "Nasogastric aspirate"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #278020009
-* ^expansion.contains[=].display = "Spot urine specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #258649003
-* ^expansion.contains[=].display = "Intravenous infusion fluid specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #258609006
-* ^expansion.contains[=].display = "Sputum specimen obtained by aspiration from trachea"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #258607008
-* ^expansion.contains[=].display = "Bronchoalveolar lavage fluid specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #258603007
-* ^expansion.contains[=].display = "Respiratory specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #258591005
-* ^expansion.contains[=].display = "White blood cell specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #258580003
-* ^expansion.contains[=].display = "Whole blood specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #258574006
-* ^expansion.contains[=].display = "Mid-stream urine specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #258531008
-* ^expansion.contains[=].display = "Wound swab"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #258530009
-* ^expansion.contains[=].display = "Urethral swab"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #258528007
-* ^expansion.contains[=].display = "Rectal swab"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #258523003
-* ^expansion.contains[=].display = "Vulval swab"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #258520000
-* ^expansion.contains[=].display = "Vaginal swab"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #258505006
-* ^expansion.contains[=].display = "Skin ulcer swab"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #258503004
-* ^expansion.contains[=].display = "Skin swab"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #258502009
-* ^expansion.contains[=].display = "Pus swab"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #258500001
-* ^expansion.contains[=].display = "Nasopharyngeal swab"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #258498002
-* ^expansion.contains[=].display = "Conjunctival swab"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #258482009
-* ^expansion.contains[=].display = "Vesicle fluid specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #258474009
-* ^expansion.contains[=].display = "Sinus fluid specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #258463000
-* ^expansion.contains[=].display = "Jejunal fluid specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #258459007
-* ^expansion.contains[=].display = "Gastric fluid specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #258455001
-* ^expansion.contains[=].display = "Drainage fluid specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #258453008
-* ^expansion.contains[=].display = "Cyst fluid specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #258450006
-* ^expansion.contains[=].display = "Cerebrospinal fluid specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #258442002
-* ^expansion.contains[=].display = "Fluid specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #258441009
-* ^expansion.contains[=].display = "Exudate specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #258440005
-* ^expansion.contains[=].display = "Effusion specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #258438000
-* ^expansion.contains[=].display = "Vitreous humor specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #258435002
-* ^expansion.contains[=].display = "Tumor tissue specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #258415003
-* ^expansion.contains[=].display = "Biopsy specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #257261003
-* ^expansion.contains[=].display = "Swab"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #168141000
-* ^expansion.contains[=].display = "Nasal fluid specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #168139001
-* ^expansion.contains[=].display = "Peritoneal fluid specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #168138009
-* ^expansion.contains[=].display = "Gastric lavage aspirate specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #168137004
-* ^expansion.contains[=].display = "Gastric aspirate specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #122880004
-* ^expansion.contains[=].display = "Urine specimen obtained by clean catch procedure"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #122877000
-* ^expansion.contains[=].display = "Upper respiratory fluid specimen obtained by tracheal aspiration"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #122609004
-* ^expansion.contains[=].display = "Specimen from lung obtained by bronchial washing procedure"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #122593002
-* ^expansion.contains[=].display = "Tissue specimen obtained from ulcer"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #122580007
-* ^expansion.contains[=].display = "Cerumen specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #122575003
-* ^expansion.contains[=].display = "Urine specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #122572000
-* ^expansion.contains[=].display = "Vomitus specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #122568004
-* ^expansion.contains[=].display = "Exudate specimen from wound"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #122566000
-* ^expansion.contains[=].display = "Fluid specimen from wound"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #122565001
-* ^expansion.contains[=].display = "Urinary catheter specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #122560006
-* ^expansion.contains[=].display = "Blood specimen from blood donor"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #122556008
-* ^expansion.contains[=].display = "Cord blood specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #122555007
-* ^expansion.contains[=].display = "Venous blood specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #122554006
-* ^expansion.contains[=].display = "Capillary blood specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #122552005
-* ^expansion.contains[=].display = "Arterial blood specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #119401005
-* ^expansion.contains[=].display = "Specimen from conjunctiva"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #119395005
-* ^expansion.contains[=].display = "Specimen from uterine cervix"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #119394009
-* ^expansion.contains[=].display = "Specimen from vagina"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #119376003
-* ^expansion.contains[=].display = "Tissue specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #119371008
-* ^expansion.contains[=].display = "Specimen from abscess"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #119370009
-* ^expansion.contains[=].display = "Specimen from fistula"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #119367005
-* ^expansion.contains[=].display = "Specimen from burn injury"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #119366001
-* ^expansion.contains[=].display = "Specimen from wound abscess"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #119365002
-* ^expansion.contains[=].display = "Specimen from wound"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #119364003
-* ^expansion.contains[=].display = "Serum specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #119363009
-* ^expansion.contains[=].display = "Platelet rich plasma specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #119362004
-* ^expansion.contains[=].display = "Platelet poor plasma specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #119361006
-* ^expansion.contains[=].display = "Plasma specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #119360007
-* ^expansion.contains[=].display = "Dialysis fluid specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #119351004
-* ^expansion.contains[=].display = "Erythrocyte specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #119350003
-* ^expansion.contains[=].display = "Calculus specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #119349003
-* ^expansion.contains[=].display = "Spermatozoa specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #119345009
-* ^expansion.contains[=].display = "Menstrual blood specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #119344008
-* ^expansion.contains[=].display = "Specimen from genital system"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #119342007
-* ^expansion.contains[=].display = "Saliva specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #119341000
-* ^expansion.contains[=].display = "Bile specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #119339001
-* ^expansion.contains[=].display = "Stool specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #119337004
-* ^expansion.contains[=].display = "Inhaled gas specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #119336008
-* ^expansion.contains[=].display = "Exhaled air specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #119335007
-* ^expansion.contains[=].display = "Coughed sputum specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #119334006
-* ^expansion.contains[=].display = "Sputum specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #119332005
-* ^expansion.contains[=].display = "Synovial fluid specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #119329007
-* ^expansion.contains[=].display = "Colostrum specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #119327009
-* ^expansion.contains[=].display = "Nail specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #119325001
-* ^expansion.contains[=].display = "Tissue specimen from skin"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #119323008
-* ^expansion.contains[=].display = "Pus specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #119320006
-* ^expansion.contains[=].display = "Food specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #119318008
-* ^expansion.contains[=].display = "Water specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #119312009
-* ^expansion.contains[=].display = "Catheter tip submitted as specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #119311002
-* ^expansion.contains[=].display = "Catheter submitted as specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #119305000
-* ^expansion.contains[=].display = "Specimen from plasma bag"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #119304001
-* ^expansion.contains[=].display = "Specimen from blood bag"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #119300005
-* ^expansion.contains[=].display = "Specimen from blood product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #119297000
-* ^expansion.contains[=].display = "Blood specimen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #119295008
-* ^expansion.contains[=].display = "Specimen obtained by aspiration"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #119294007
-* ^expansion.contains[=].display = "Dried blood specimen"
-* include codes from system http://snomed.info/sct
-    where constraint = "< 123038009 |Specimen (specimen)| AND ^ 816080008 |International Patient Summary (foundation metadata concept)|"
\ No newline at end of file
diff --git a/input/fsh/valuesets/ResultsSpecimenTypeUvIps.fsh b/input/fsh/valuesets/ResultsSpecimenTypeUvIps.fsh
index 7a5118e5..70719329 100644
--- a/input/fsh/valuesets/ResultsSpecimenTypeUvIps.fsh
+++ b/input/fsh/valuesets/ResultsSpecimenTypeUvIps.fsh
@@ -1,12 +1,15 @@
 ValueSet: ResultsSpecimenTypeUvIps
 Id: results-specimen-type-uv-ips
 Title: "Results Specimen Type - IPS"
-Description: "IPS Specimen Type value set. This value set includes a set of codes from SNOMED CT that may be used to represent specimen types."
+Description: """
+IPS Specimen Type codes value set.  This value set includes codes from SNOMED CT®: all descendants of 123038009 \|Specimen (specimen)\|
+
+SNOMED CT® ECL definition:\
+< 123038009 \|Specimen (specimen)\|
+"""
 * ^meta.profile = "http://hl7.org/fhir/StructureDefinition/shareablevalueset"
-* ^version = "1.1.0"
 * ^status = #active
 * ^experimental = false
-* ^date = "2024-06-19T10:50:07-05:00"
 * ^publisher = "HL7 International / Patient Care"
 * ^contact.telecom.system = #url
 * ^contact.telecom.value = "http://www.hl7.org/Special/committees/patientcare"
@@ -14,4 +17,4 @@ Description: "IPS Specimen Type value set. This value set includes a set of code
 * ^immutable = false
 * ^copyright = "This value set includes content from SNOMED CT, which is copyright © 2002+ International Health Terminology Standards Development Organisation (IHTSDO), and distributed by agreement between IHTSDO and HL7. Implementer use of SNOMED CT is not covered by this agreement"
 * include codes from system http://snomed.info/sct
-    where concept descendent-of #123038009
\ No newline at end of file
+    where concept descendent-of #123038009 "Specimen (specimen)"
\ No newline at end of file
diff --git a/input/fsh/valuesets/TargetSiteUvIps.fsh b/input/fsh/valuesets/TargetSiteUvIps.fsh
deleted file mode 100644
index 5c0e9477..00000000
--- a/input/fsh/valuesets/TargetSiteUvIps.fsh
+++ /dev/null
@@ -1,20 +0,0 @@
-ValueSet: TargetSiteUvIps
-Id: target-site-uv-ips
-Title: "Target Site - IPS"
-Description: "This value set includes codes from SNOMED Clinical Terms®: all descendants of 442083009 | Anatomical or acquired body structure (body structure)|."
-* ^meta.profile = "http://hl7.org/fhir/StructureDefinition/shareablevalueset"
-* ^identifier.use = #official
-* ^identifier.system = "http://art-decor.org/ns/oids/vs"
-* ^identifier.value = "2.16.840.1.113883.11.22.55"
-* ^version = "1.1.0"
-* ^status = #active
-* ^experimental = false
-* ^date = "2024-06-19T10:50:07-05:00"
-* ^publisher = "HL7 International / Patient Care"
-* ^contact.telecom.system = #url
-* ^contact.telecom.value = "http://www.hl7.org/Special/committees/patientcare"
-* ^jurisdiction = $m49.htm#001
-* ^immutable = false
-* ^copyright = "This value set includes content from SNOMED CT, which is copyright © 2002+ International Health Terminology Standards Development Organisation (IHTSDO), and distributed by agreement between IHTSDO and HL7. Implementer use of SNOMED CT is not covered by this agreement"
-* include codes from system http://snomed.info/sct
-    where concept descendent-of #442083009
\ No newline at end of file
diff --git a/input/fsh/valuesets/VaccineTargetDiseasesSnomedCtIpsFreeSet.fsh b/input/fsh/valuesets/VaccineTargetDiseasesSnomedCtIpsFreeSet.fsh
deleted file mode 100644
index bac26616..00000000
--- a/input/fsh/valuesets/VaccineTargetDiseasesSnomedCtIpsFreeSet.fsh
+++ /dev/null
@@ -1,88 +0,0 @@
-ValueSet: VaccineTargetDiseasesSnomedCtIpsFreeSet
-Id: target-diseases-snomed-ct-ips-free-set
-Title: "Vaccine Target Diseases - SNOMED CT IPS Free Set"
-Description: "This value set includes the codes from the SNOMED International Patient Set (IPS) subset of SNOMED CT (IPS Free Set) describing Vaccine Target Diseases."
-* ^meta.profile = "http://hl7.org/fhir/StructureDefinition/shareablevalueset"
-* ^version = "1.1.0"
-* ^status = #active
-* ^experimental = false
-* ^date = "2022-08-02T19:48:09-05:00"
-* ^publisher = "HL7 International / Patient Care"
-* ^contact.telecom.system = #url
-* ^contact.telecom.value = "http://www.hl7.org/Special/committees/patientcare"
-* ^jurisdiction = $m49.htm#001
-* ^immutable = false
-* ^copyright = "The SNOMED International IPS Terminology is distributed by International Health Terminology Standards Development Organisation, trading as SNOMED International, and is subject the terms of the [Creative Commons Attribution 4.0 International Public License](https://creativecommons.org/licenses/by/4.0/). For more information, see [SNOMED IPS Terminology](https://www.snomed.org/snomed-ct/Other-SNOMED-products/international-patient-summary-terminology)"
-* ^expansion.timestamp = "2022-08-03T03:49:02.324+00:00"
-* ^expansion.total = 22
-* ^expansion.offset = 0
-* ^expansion.parameter.name = "version"
-* ^expansion.parameter.valueUri = "http://snomed.info/sct/version/20220731"
-* ^expansion.contains[0].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #4834000
-* ^expansion.contains[=].display = "Typhoid fever"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #6142004
-* ^expansion.contains[=].display = "Influenza"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #14189004
-* ^expansion.contains[=].display = "Measles"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #23502006
-* ^expansion.contains[=].display = "Lyme disease"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #24662006
-* ^expansion.contains[=].display = "Influenza due to Influenza B virus"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #25225006
-* ^expansion.contains[=].display = "Disease due to Adenovirus"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #27836007
-* ^expansion.contains[=].display = "Pertussis"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #32398004
-* ^expansion.contains[=].display = "Bronchitis"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #36989005
-* ^expansion.contains[=].display = "Mumps"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #38907003
-* ^expansion.contains[=].display = "Varicella"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #40468003
-* ^expansion.contains[=].display = "Viral hepatitis, type A"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #50711007
-* ^expansion.contains[=].display = "Viral hepatitis C"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #56717001
-* ^expansion.contains[=].display = "Tuberculosis"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #66071002
-* ^expansion.contains[=].display = "Type B viral hepatitis"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #70036007
-* ^expansion.contains[=].display = "Haemophilus influenzae pneumonia"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #76902006
-* ^expansion.contains[=].display = "Tetanus"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #186150001
-* ^expansion.contains[=].display = "Enteritis due to rotavirus"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #240532009
-* ^expansion.contains[=].display = "Human papilloma virus infection"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #372244006
-* ^expansion.contains[=].display = "Malignant melanoma"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #398102009
-* ^expansion.contains[=].display = "Acute poliomyelitis"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #442438000
-* ^expansion.contains[=].display = "Influenza due to Influenza A virus"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #840539006
-* ^expansion.contains[=].display = "COVID-19"
-* include codes from system http://snomed.info/sct
-    where constraint = "(4834000 |Typhoid fever (disorder)| or 6142004 |Influenza (disorder)| or 6541001 |Yellow fever (disorder)| or 14189004 |Measles (disorder)| or 14168008 |Rabies (disorder)| or 18624000 |Disease caused by Rotavirus (disorder)| or 23502006 |Lyme disease (disorder)| or 23511006 |Meningococcal infectious disease (disorder)| or 24662006 |Influenza caused by Influenza B virus (disorder)| or 25225006 |Disease caused by Adenovirus (disorder)| or 27836007 |Pertussis (disorder)| or 32398004 |Bronchitis (disorder)| or 36653000 |Rubella (disorder)| or 36989005 |Mumps (disorder)| or 37246009 |Disease caused by rickettsiae (disorder)| or 38907003 |Varicella (disorder)| or 40468003 |Viral hepatitis type A (disorder)| or 50711007 |Viral hepatitis type C (disorder)| or 52947006 |Japanese encephalitis virus disease (disorder)| or 56717001 |Tuberculosis (disorder)| or 58750007 |Plague (disorder)| or 63650001 |Cholera (disorder)| or 66071002 |Viral hepatitis type B (disorder)| or 67924001 |Smallpox (disorder)| or 70036007 |Haemophilus influenzae pneumonia (disorder)| or 75702008 |Brucellosis (disorder)| or 76902006 |Tetanus (disorder)| or 85904008 |Paratyphoid fever (disorder)| or 111852003 |Vaccinia (disorder)| or 186150001 |Enteritis caused by rotavirus (disorder)| or 186772009 |Rocky Mountain spotted fever (disorder)| or 186788009 |Q fever (disorder)| or 240532009 |Human papillomavirus infection (disorder)| or 240613006 |Typhus group rickettsial disease (disorder)| or 372244006 |Malignant melanoma (disorder)| or 397430003 |Diphtheria caused by Corynebacterium diphtheriae (disorder)| or 398102009 |Acute poliomyelitis (disorder)| or 398565003 |Infection caused by Clostridium botulinum (disorder)| or 409498004 |Anthrax (disorder)| or 417093003 |Disease caused by West Nile virus (disorder)| or 442438000 |Influenza caused by Influenza A virus (disorder)| or 442696006 |Influenza caused by Influenza A virus subtype H1N1 (disorder)| or 450715004 |Influenza caused by Influenza A virus subtype H7 (disorder)| or 707448003 |Influenza caused by Influenza A virus subtype H7N9 (disorder)| or 709410003 |Haemophilus influenzae type b infection (disorder)| or 712986001 |Encephalitis caused by tick-borne encephalitis virus (disorder)| or 713083002 |Influenza caused by Influenza A virus subtype H5 (disorder)| or 772810003 |Influenza caused by Influenza A virus subtype H3N2 (disorder)| or 772828001 |Influenza caused by Influenza A virus subtype H5N1 (disorder)| or 840539006 |Disease caused by severe acute respiratory syndrome coronavirus 2 (disorder)|) and ^ 816080008 |International Patient Summary (foundation metadata concept)|"
\ No newline at end of file
diff --git a/input/fsh/valuesets/VaccineTargetDiseasesUvIps.fsh b/input/fsh/valuesets/VaccineTargetDiseasesUvIps.fsh
index 283cd964..e748cce2 100644
--- a/input/fsh/valuesets/VaccineTargetDiseasesUvIps.fsh
+++ b/input/fsh/valuesets/VaccineTargetDiseasesUvIps.fsh
@@ -1,12 +1,15 @@
 ValueSet: VaccineTargetDiseasesUvIps
 Id: target-diseases-uv-ips
 Title: "Vaccine Target Diseases - IPS"
-Description: "This value set includes the codes from SNOMED CT describing Vaccine Target Diseases."
+Description: """
+IPS Vaccine target disease codes value set.  This value set includes codes from SNOMED CT that represent specific vaccine target diseases (descendant concepts, if they exist, are not included).
+
+SNOMED CT® ECL definition:\
+4834000 \|Typhoid fever (disorder)\| OR 6142004 \|Influenza (disorder)\| OR 16541001 \|Yellow fever (disorder)\| OR 14189004 \|Measles (disorder)\| OR 14168008 \|Rabies (disorder)\| OR 18624000 \|Disease caused by Rotavirus (disorder)\| OR 23502006 \|Lyme disease (disorder)\| OR 23511006 \|Meningococcal infectious disease (disorder)\| OR 24662006 \|Influenza caused by Influenza B virus (disorder)\| OR 25225006 \|Disease caused by Adenovirus (disorder)\| OR 27836007 \|Pertussis (disorder)\| OR 32398004 \|Bronchitis (disorder)\| OR 36653000 \|Rubella (disorder)\| OR 36989005 \|Mumps (disorder)\| OR 37246009 \|Disease caused by rickettsiae (disorder)\| OR 38907003 \|Varicella (disorder)\| OR 40468003 \|Viral hepatitis, type A (disorder)\| OR 50711007 \|Viral hepatitis type C (disorder)\| OR 52947006 \|Japanese encephalitis virus disease (disorder)\| OR 56717001 \|Tuberculosis (disorder)\| OR 58750007 \|Plague (disorder)\| OR 63650001 \|Cholera (disorder)\| OR 66071002 \|Viral hepatitis type B (disorder)\| OR 67924001 \|Smallpox (disorder)\| OR 70036007 \|Haemophilus influenzae pneumonia (disorder)\| OR 75702008 \|Brucellosis (disorder)\| OR 76902006 \|Tetanus (disorder)\| OR 85904008 \|Paratyphoid fever (disorder)\| OR 111852003 \|Vaccinia (disorder)\| OR 186150001 \|Enteritis caused by rotavirus (disorder)\| OR 186772009 \|Rocky Mountain spotted fever (disorder)\| OR 186788009 \|Q fever (disorder)\| OR 240532009 \|Human papillomavirus infection (disorder)\| OR 240613006 \|Typhus group rickettsial disease (disorder)\| OR 372244006 \|Malignant melanoma (disorder)\| OR 397430003 \|Diphtheria caused by Corynebacterium diphtheriae (disorder)\| OR 398102009 \|Acute poliomyelitis (disorder)\| OR 398565003 \|Infection caused by Clostridium botulinum (disorder)\| OR 409498004 \|Anthrax (disorder)\| OR 417093003 \|Disease caused by West Nile virus (disorder)\| OR 442438000 \|Influenza caused by Influenza A virus (disorder)\| OR 442696006 \|Influenza caused by Influenza A virus subtype H1N1 (disorder)\| OR 450715004 \|Influenza caused by Influenza A virus subtype H7 (disorder)\| OR 707448003 \|Influenza caused by Influenza A virus subtype H7N9 (disorder)\| OR 709410003 \|Haemophilus influenzae type b infection (disorder)\| OR 712986001 \|Encephalitis caused by tick-borne encephalitis virus (disorder)\| OR 713083002 \|Influenza caused by Influenza A virus subtype H5 (disorder)\| OR 772810003 \|Influenza caused by Influenza A virus subtype H3N2 (disorder)\| OR 772828001 \|Influenza caused by Influenza A virus subtype H5N1 (disorder)\| OR 840539006 \|Disease caused by severe acute respiratory syndrome coronavirus 2 (disorder)\|
+"""
 * ^meta.profile = "http://hl7.org/fhir/StructureDefinition/shareablevalueset"
-* ^version = "1.1.0"
 * ^status = #active
 * ^experimental = false
-* ^date = "2024-06-19T10:50:07-05:00"
 * ^publisher = "HL7 International / Patient Care"
 * ^contact.telecom.system = #url
 * ^contact.telecom.value = "http://www.hl7.org/Special/committees/patientcare"
@@ -15,7 +18,7 @@ Description: "This value set includes the codes from SNOMED CT describing Vaccin
 * ^copyright = "This value set includes content from SNOMED CT, which is copyright © 2002+ International Health Terminology Standards Development Organisation (IHTSDO), and distributed by agreement between IHTSDO and HL7. Implementer use of SNOMED CT is not covered by this agreement"
 * SNOMED_CT#4834000 "Typhoid fever (disorder)"
 * SNOMED_CT#6142004 "Influenza (disorder)"
-* SNOMED_CT#6541001 "Yellow fever (disorder)"
+* SNOMED_CT#16541001 "Yellow fever (disorder)"
 * SNOMED_CT#14189004 "Measles (disorder)"
 * SNOMED_CT#14168008 "Rabies (disorder)"
 * SNOMED_CT#18624000 "Disease caused by Rotavirus (disorder)"
diff --git a/input/fsh/valuesets/VaccineTargetDiseasesUvIpsDeprecated.fsh b/input/fsh/valuesets/VaccineTargetDiseasesUvIpsDeprecated.fsh
deleted file mode 100644
index f5b25318..00000000
--- a/input/fsh/valuesets/VaccineTargetDiseasesUvIpsDeprecated.fsh
+++ /dev/null
@@ -1,64 +0,0 @@
-ValueSet: VaccineTargetDiseasesUvIpsDeprecated
-Id: targetDiseases-uv-ips
-Title: "Vaccine Target Diseases - IPS [Deprecated]"
-Description: "This value set includes the codes from SNOMED CT describing Vaccine Target Diseases. To follow a consistent value set naming pattern, this value set has been deprecated and will be removed in a future release.  It has been replaced with [target-diseases-uv-ips](./ValueSet-target-diseases-uv-ips.html)"
-* ^meta.profile = "http://hl7.org/fhir/StructureDefinition/shareablevalueset"
-* ^version = "1.1.0"
-* ^status = #active
-* ^experimental = false
-* ^date = "2024-06-19T10:50:07-05:00"
-* ^publisher = "HL7 International / Patient Care"
-* ^contact.telecom.system = #url
-* ^contact.telecom.value = "http://www.hl7.org/Special/committees/patientcare"
-* ^jurisdiction = $m49.htm#001
-* ^immutable = false
-* ^copyright = "This value set includes content from SNOMED CT, which is copyright © 2002+ International Health Terminology Standards Development Organisation (IHTSDO), and distributed by agreement between IHTSDO and HL7. Implementer use of SNOMED CT is not covered by this agreement"
-* SNOMED_CT#186150001 "Enteritis caused by rotavirus (disorder)"
-* SNOMED_CT#56717001 "Tuberculosis (disorder)"
-* SNOMED_CT#27836007 "Pertussis (disorder)"
-* SNOMED_CT#372244006 "Malignant melanoma (disorder)"
-* SNOMED_CT#36989005 "Mumps (disorder)"
-* SNOMED_CT#38907003 "Varicella (disorder)"
-* SNOMED_CT#23502006 "Lyme disease (disorder)"
-* SNOMED_CT#14189004 "Measles (disorder)"
-* SNOMED_CT#25225006 "Disease caused by Adenovirus (disorder)"
-* SNOMED_CT#442438000 "Influenza caused by Influenza A virus (disorder)"
-* SNOMED_CT#24662006 "Influenza caused by Influenza B virus (disorder)"
-* SNOMED_CT#6142004 "Influenza (disorder)"
-* SNOMED_CT#240532009 "Human papillomavirus infection (disorder)"
-* SNOMED_CT#4834000 "Typhoid fever (disorder)"
-* SNOMED_CT#76902006 "Tetanus (disorder)"
-* SNOMED_CT#32398004 "Bronchitis (disorder)"
-* SNOMED_CT#70036007 "Haemophilus influenzae pneumonia (disorder)"
-* SNOMED_CT#398102009 "Acute poliomyelitis (disorder)"
-* SNOMED_CT#40468003 "Viral hepatitis, type A (disorder)"
-* SNOMED_CT#66071002 "Viral hepatitis type B (disorder)"
-* SNOMED_CT#50711007 "Viral hepatitis type C (disorder)"
-* SNOMED_CT#397430003 "Diphtheria caused by Corynebacterium diphtheriae (disorder)"
-* SNOMED_CT#409498004 "Anthrax (disorder)"
-* SNOMED_CT#75702008 "Brucellosis (disorder)"
-* SNOMED_CT#63650001 "Cholera (disorder)"
-* SNOMED_CT#709410003 "Haemophilus influenzae type b infection (disorder)"
-* SNOMED_CT#442696006 "Influenza caused by Influenza A virus subtype H1N1 (disorder)"
-* SNOMED_CT#772810003 "Influenza caused by Influenza A virus subtype H3N2 (disorder)"
-* SNOMED_CT#713083002 "Influenza caused by Influenza A virus subtype H5 (disorder)"
-* SNOMED_CT#772828001 "Influenza caused by Influenza A virus subtype H5N1 (disorder)"
-* SNOMED_CT#450715004 "Influenza caused by Influenza A virus subtype H7 (disorder)"
-* SNOMED_CT#707448003 "Influenza caused by Influenza A virus subtype H7N9 (disorder)"
-* SNOMED_CT#52947006 "Japanese encephalitis virus disease (disorder)"
-* SNOMED_CT#36653000 "Rubella (disorder)"
-* SNOMED_CT#67924001 "Smallpox (disorder)"
-* SNOMED_CT#23511006 "Meningococcal infectious disease (disorder)"
-* SNOMED_CT#85904008 "Paratyphoid fever (disorder)"
-* SNOMED_CT#398565003 "Infection caused by Clostridium botulinum (disorder)"
-* SNOMED_CT#58750007 "Plague (disorder)"
-* SNOMED_CT#186788009 "Q fever (disorder)"
-* SNOMED_CT#14168008 "Rabies (disorder)"
-* SNOMED_CT#37246009 "Disease caused by rickettsiae (disorder)"
-* SNOMED_CT#186772009 "Rocky Mountain spotted fever (disorder)"
-* SNOMED_CT#18624000 "Disease caused by Rotavirus (disorder)"
-* SNOMED_CT#712986001 "Encephalitis caused by tick-borne encephalitis virus (disorder)"
-* SNOMED_CT#240613006 "Typhus group rickettsial disease (disorder)"
-* SNOMED_CT#111852003 "Vaccinia (disorder)"
-* SNOMED_CT#417093003 "Disease caused by West Nile virus (disorder)"
-* SNOMED_CT#6541001 "Yellow fever (disorder)"
\ No newline at end of file
diff --git a/input/fsh/valuesets/VaccinesSnomedCtIpsFreeSet.fsh b/input/fsh/valuesets/VaccinesSnomedCtIpsFreeSet.fsh
deleted file mode 100644
index 4ecde96c..00000000
--- a/input/fsh/valuesets/VaccinesSnomedCtIpsFreeSet.fsh
+++ /dev/null
@@ -1,255 +0,0 @@
-ValueSet: VaccinesSnomedCtIpsFreeSet
-Id: vaccines-snomed-ct-ips-free-set
-Title: "Vaccines - SNOMED CT IPS Free Set"
-Description: "This value set includes the codes from the SNOMED International Patient Set (IPS) subset of SNOMED CT (IPS Free Set) that are included in: all descendants of 71181003 \\|Product containing vaccine (product)\\|."
-* ^version = "1.1.0"
-* ^status = #active
-* ^experimental = false
-* ^date = "2022-09-07T11:24:30+00:00"
-* ^publisher = "HL7 International / Patient Care"
-* ^contact.telecom.system = #url
-* ^contact.telecom.value = "http://www.hl7.org/Special/committees/patientcare"
-* ^jurisdiction = $m49.htm#001
-* ^immutable = false
-* ^copyright = "The SNOMED International IPS Terminology is distributed by International Health Terminology Standards Development Organisation, trading as SNOMED International, and is subject the terms of the [Creative Commons Attribution 4.0 International Public License](https://creativecommons.org/licenses/by/4.0/). For more information, see [SNOMED IPS Terminology](https://www.snomed.org/snomed-ct/Other-SNOMED-products/international-patient-summary-terminology)"
-* ^expansion.timestamp = "2022-09-07T11:24:30+00:00"
-* ^expansion.total = 78
-* ^expansion.offset = 0
-* ^expansion.parameter.name = "version"
-* ^expansion.parameter.valueUri = "http://snomed.info/sct/version/20220731"
-* ^expansion.contains[0].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #2221000221107
-* ^expansion.contains[=].display = "Live attenuated Human alphaherpesvirus 3 only vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #2171000221104
-* ^expansion.contains[=].display = "Salmonella enterica subspecies enterica serovar Typhi capsular polysaccharide unconjugated antigen only vaccine product in parenteral dose form"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #1981000221108
-* ^expansion.contains[=].display = "Neisseria meningitidis serogroup B antigen only vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #1801000221105
-* ^expansion.contains[=].display = "Streptococcus pneumoniae capsular polysaccharide antigen conjugated only vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #1181000221105
-* ^expansion.contains[=].display = "Influenza virus antigen only vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #1131000221109
-* ^expansion.contains[=].display = "Vaccine product containing only inactivated whole Rabies lyssavirus antigen"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #1121000221106
-* ^expansion.contains[=].display = "Live attenuated Yellow fever virus antigen only vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #1101000221104
-* ^expansion.contains[=].display = "Clostridium tetani toxoid antigen-containing vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #1081000221109
-* ^expansion.contains[=].display = "Live attenuated Rotavirus antigen only vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #1051000221104
-* ^expansion.contains[=].display = "Live attenuated Human poliovirus serotypes 1 and 3 antigens only vaccine product in oral dose form"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #1031000221108
-* ^expansion.contains[=].display = "Human poliovirus antigen-containing vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #1011000221100
-* ^expansion.contains[=].display = "Live attenuated Vibrio cholerae antigen only vaccine product in oral dose form"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #1001000221103
-* ^expansion.contains[=].display = "Inactivated whole Vibrio cholerae antigen only vaccine product in oral dose form"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #971000221109
-* ^expansion.contains[=].display = "Live attenuated Salmonella enterica subspecies enterica serovar Typhi antigen only vaccine product in oral dose form"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #601000221108
-* ^expansion.contains[=].display = "Bordetella pertussis antigen-containing vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #1119254000
-* ^expansion.contains[=].display = "Streptococcus pneumoniae Danish serotype 1, 3, 4, 5, 6A, 6B, 7F, 9V, 14, 18C, 19A, 19F, and 23F capsular polysaccharide antigens only vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #1052328007
-* ^expansion.contains[=].display = "Streptococcus pneumoniae Danish serotype 4, 6B, 9V, 14, 18C, 19F, and 23F capsular polysaccharide antigens conjugated only vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #871921009
-* ^expansion.contains[=].display = "Staphylococcus toxoid vaccine"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #871918007
-* ^expansion.contains[=].display = "Rickettsia antigen-containing vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #871908002
-* ^expansion.contains[=].display = "Human alphaherpesvirus 3 and Measles morbillivirus and Mumps orthorubulavirus and Rubella virus antigens only vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #871895005
-* ^expansion.contains[=].display = "Bordetella pertussis and Clostridium tetani and Corynebacterium diphtheriae and Haemophilus influenzae type b and Hepatitis B virus and Human poliovirus antigens only vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #871889009
-* ^expansion.contains[=].display = "Acellular Bordetella pertussis and Corynebacterium diphtheriae and Hepatitis B virus and inactivated whole Human poliovirus antigens only vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #871887006
-* ^expansion.contains[=].display = "Bordetella pertussis and Clostridium tetani and Corynebacterium diphtheriae and Haemophilus influenzae type b and Human poliovirus antigens only vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #871878002
-* ^expansion.contains[=].display = "Bordetella pertussis and Clostridium tetani and Corynebacterium diphtheriae and Human poliovirus antigens only vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #871876003
-* ^expansion.contains[=].display = "Acellular Bordetella pertussis and Clostridium tetani and Corynebacterium diphtheriae antigens only vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #871875004
-* ^expansion.contains[=].display = "Bordetella pertussis and Clostridium tetani and Corynebacterium diphtheriae antigens only vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #871873006
-* ^expansion.contains[=].display = "Neisseria meningitidis serogroup A, C, W135 and Y only vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #871871008
-* ^expansion.contains[=].display = "Neisseria meningitidis serogroup A and C only vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #871866001
-* ^expansion.contains[=].display = "Neisseria meningitidis serogroup C only vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #871839001
-* ^expansion.contains[=].display = "Bordetella pertussis and Clostridium tetani and Corynebacterium diphtheriae and Haemophilus influenzae type b antigens only vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #871837004
-* ^expansion.contains[=].display = "Clostridium tetani and Corynebacterium diphtheriae and Human poliovirus antigens only vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #871831003
-* ^expansion.contains[=].display = "Measles morbillivirus and Mumps orthorubulavirus and Rubella virus antigens only vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #871826000
-* ^expansion.contains[=].display = "Clostridium tetani and Corynebacterium diphtheriae antigens only vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #871806004
-* ^expansion.contains[=].display = "Haemophilus influenzae type b and Hepatitis B virus antigens only vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #871804001
-* ^expansion.contains[=].display = "Hepatitis A virus and Salmonella enterica subspecies enterica serovar Typhi antigens only vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #871803007
-* ^expansion.contains[=].display = "Hepatitis A and Hepatitis B virus antigens only vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #871772009
-* ^expansion.contains[=].display = "Influenza A virus subtype H1N1 antigen only vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #871768005
-* ^expansion.contains[=].display = "Influenza virus antigen only vaccine product in nasal dose form"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #871765008
-* ^expansion.contains[=].display = "Measles morbillivirus antigen only vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #871759008
-* ^expansion.contains[=].display = "Acellular Bordetella pertussis only vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #871740006
-* ^expansion.contains[=].display = "Inactivated whole Human poliovirus antigen only vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #871738001
-* ^expansion.contains[=].display = "Live attenuated Mumps orthorubulavirus antigen only vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #871737006
-* ^expansion.contains[=].display = "Mumps orthorubulavirus antigen only vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #863911006
-* ^expansion.contains[=].display = "Clostridium tetani antigen-containing vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #840599008
-* ^expansion.contains[=].display = "Borrelia burgdorferi antigen-containing vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #840549009
-* ^expansion.contains[=].display = "Yersinia pestis antigen-containing vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #836500008
-* ^expansion.contains[=].display = "Haemophilus influenzae type b and Neisseria meningitidis serogroup C antigens only vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #836498007
-* ^expansion.contains[=].display = "Mumps orthorubulavirus antigen-containing vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #836495005
-* ^expansion.contains[=].display = "Human alphaherpesvirus 3 antigen-containing vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #836403007
-* ^expansion.contains[=].display = "Tick-borne encephalitis virus antigen-containing vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #836402002
-* ^expansion.contains[=].display = "Bacillus Calmette-Guerin antigen-containing vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #836401009
-* ^expansion.contains[=].display = "Neisseria meningitidis antigen-containing vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #836398006
-* ^expansion.contains[=].display = "Streptococcus pneumoniae antigen-containing vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #836397001
-* ^expansion.contains[=].display = "Coxiella burnetii antigen-containing vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #836393002
-* ^expansion.contains[=].display = "Rabies lyssavirus antigen-containing vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #836390004
-* ^expansion.contains[=].display = "Salmonella enterica subspecies enterica serovar Typhi antigen-containing vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #836389008
-* ^expansion.contains[=].display = "Vaccinia virus antigen-containing vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #836388000
-* ^expansion.contains[=].display = "Rubella virus antigen-containing vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #836387005
-* ^expansion.contains[=].display = "Rotavirus antigen-containing vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #836385002
-* ^expansion.contains[=].display = "Yellow fever virus antigen-containing vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #836384003
-* ^expansion.contains[=].display = "Bacillus anthracis antigen-containing vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #836383009
-* ^expansion.contains[=].display = "Vibrio cholerae antigen-containing vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #836382004
-* ^expansion.contains[=].display = "Measles morbillivirus antigen-containing vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #836381006
-* ^expansion.contains[=].display = "Corynebacterium diphtheriae antigen-containing vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #836380007
-* ^expansion.contains[=].display = "Haemophilus influenzae type b antigen-containing vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #836379009
-* ^expansion.contains[=].display = "Human papillomavirus antigen-containing vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #836378001
-* ^expansion.contains[=].display = "Japanese encephalitis virus antigen-containing vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #836377006
-* ^expansion.contains[=].display = "Influenza virus antigen-containing vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #836375003
-* ^expansion.contains[=].display = "Hepatitis A virus antigen-containing vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #836374004
-* ^expansion.contains[=].display = "Hepatitis B virus antigen-containing vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #836369007
-* ^expansion.contains[=].display = "Virus antigen-containing vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #836368004
-* ^expansion.contains[=].display = "Bacteria antigen-containing vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #777725002
-* ^expansion.contains[=].display = "Clostridium tetani toxoid antigen adsorbed only vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #775641005
-* ^expansion.contains[=].display = "Clostridium tetani toxoid adsorbed and Corynebacterium diphtheriae toxoid antigens only vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #774618008
-* ^expansion.contains[=].display = "Whole cell Bordetella pertussis and Clostridium tetani toxoid adsorbed and Corynebacterium diphtheriae toxoid antigens only vaccine product"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #428601009
-* ^expansion.contains[=].display = "Paratyphoid vaccine"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #409568008
-* ^expansion.contains[=].display = "Pentavalent botulinum toxoid vaccine"
-* ^expansion.contains[+].system = "http://snomed.info/sct"
-* ^expansion.contains[=].code = #37146000
-* ^expansion.contains[=].display = "Typhus vaccine"
-* include codes from system http://snomed.info/sct
-    where constraint = "< 787859002 |Vaccine product (medicinal product)| AND ^ 816080008 |International Patient Summary (foundation metadata concept)|"
\ No newline at end of file
diff --git a/input/fsh/valuesets/VaccinesUvIps.fsh b/input/fsh/valuesets/VaccinesUvIps.fsh
index bf4ad079..736577fd 100644
--- a/input/fsh/valuesets/VaccinesUvIps.fsh
+++ b/input/fsh/valuesets/VaccinesUvIps.fsh
@@ -1,15 +1,15 @@
 ValueSet: VaccinesUvIps
 Id: vaccines-uv-ips
 Title: "Vaccines - IPS"
-Description: "This value set provides a list of types of vaccine, plus IPS codes for absent/unknown immunizations. It includes codes from SNOMED Clinical Terms®: all descendants of 787859002 \\|Vaccine product (product)\\|."
+Description: """
+IPS Vaccine codes value set.  This value set includes codes from SNOMED CT®: all descendants of 787859002 \|Vaccine product (product)\|; all descendants or self of 787482006 \|No known immunizations (situation)\|
+
+SNOMED CT® ECL definition:\
+< 787859002 \|Vaccine product (product)\| OR \<\< 787482006 \|No known immunizations (situation)\|
+"""
 * ^meta.profile = "http://hl7.org/fhir/StructureDefinition/shareablevalueset"
-* ^identifier.use = #official
-* ^identifier.system = "http://art-decor.org/ns/oids/vs"
-* ^identifier.value = "2.16.840.1.113883.11.22.44"
-* ^version = "1.1.0"
 * ^status = #active
 * ^experimental = false
-* ^date = "2024-06-19T10:50:07-05:00"
 * ^publisher = "HL7 International / Patient Care"
 * ^contact.telecom.system = #url
 * ^contact.telecom.value = "http://www.hl7.org/Special/committees/patientcare"
@@ -17,6 +17,6 @@ Description: "This value set provides a list of types of vaccine, plus IPS codes
 * ^immutable = false
 * ^copyright = "This value set includes content from SNOMED CT, which is copyright © 2002+ International Health Terminology Standards Development Organisation (IHTSDO), and distributed by agreement between IHTSDO and HL7. Implementer use of SNOMED CT is not covered by this agreement"
 * include codes from system http://snomed.info/sct
-    where concept descendent-of #787859002
+    where concept descendent-of #787859002 "Vaccine product (product)"
 * include codes from system http://snomed.info/sct
     where concept is-a #787482006 "No known immunizations (situation)"
\ No newline at end of file
diff --git a/input/fsh/valuesets/VaccinesWhoAtcUvIps.fsh b/input/fsh/valuesets/VaccinesWhoAtcUvIps.fsh
index deaa4c65..2199f2b9 100644
--- a/input/fsh/valuesets/VaccinesWhoAtcUvIps.fsh
+++ b/input/fsh/valuesets/VaccinesWhoAtcUvIps.fsh
@@ -1,19 +1,15 @@
 ValueSet: VaccinesWhoAtcUvIps
 Id: vaccines-whoatc-uv-ips
 Title: "Vaccines WHO ATC - IPS"
-Description: "World Health Organization Anatomical Therapeutic Chemical (ATC) classification system.  Note: The currently implemented code system and the value set expansion contain only a set of example ATC codes, not the complete code system content."
+Description: "IPS Vaccine codes value set.  This value set includes codes from the World Health Organization Anatomical Therapeutic Chemical (ATC) classification system: all descendants of J07 \"VACCINES\""
 * ^meta.profile = "http://hl7.org/fhir/StructureDefinition/shareablevalueset"
-* ^identifier.use = #official
-* ^identifier.system = "http://art-decor.org/ns/oids/vs"
-* ^identifier.value = "2.16.840.1.113883.11.22.29"
-* ^version = "1.1.0"
 * ^status = #active
 * ^experimental = false
-* ^date = "2024-06-19T10:50:07-05:00"
 * ^publisher = "HL7 International / Patient Care"
 * ^contact.telecom.system = #url
 * ^contact.telecom.value = "http://www.hl7.org/Special/committees/patientcare"
 * ^jurisdiction = $m49.htm#001
 * ^immutable = false
 * ^copyright = "This artifact includes content from Anatomical Therapeutic Chemical (ATC) classification system. ATC codes are copyright World Health Organization (WHO) Collaborating Centre for Drug Statistics Methodology. Terms & Conditions in https://www.whocc.no/use_of_atc_ddd/"
-* include codes from system WC where concept is-a #J07
\ No newline at end of file
+* include codes from system http://www.whocc.no/atc
+    where concept descendent-of #J07 "VACCINES"
\ No newline at end of file
diff --git a/input/fsh/valuesets/WhoAtcUvIps.fsh b/input/fsh/valuesets/WhoAtcUvIps.fsh
index 1f0f59e4..f339799a 100644
--- a/input/fsh/valuesets/WhoAtcUvIps.fsh
+++ b/input/fsh/valuesets/WhoAtcUvIps.fsh
@@ -1,19 +1,17 @@
 ValueSet: WhoAtcUvIps
 Id: whoatc-uv-ips
 Title: "WHO ATC - IPS"
-Description: "World Health Organization Anatomical Therapeutic Chemical (ATC) classification system.  Note: The currently implemented code system and the value set expansion contain only a set of example ATC codes, not the complete code system content."
+Description: "World Health Organization Anatomical Therapeutic Chemical (ATC) classification system."
 * ^meta.profile = "http://hl7.org/fhir/StructureDefinition/shareablevalueset"
 * ^identifier.use = #official
 * ^identifier.system = "http://art-decor.org/ns/oids/vs"
 * ^identifier.value = "2.16.840.1.113883.11.22.29"
-* ^version = "1.1.0"
 * ^status = #active
 * ^experimental = false
-* ^date = "2024-06-19T10:50:07-05:00"
 * ^publisher = "HL7 International / Patient Care"
 * ^contact.telecom.system = #url
 * ^contact.telecom.value = "http://www.hl7.org/Special/committees/patientcare"
 * ^jurisdiction = $m49.htm#001
 * ^immutable = false
 * ^copyright = "This artifact includes content from Anatomical Therapeutic Chemical (ATC) classification system. ATC codes are copyright World Health Organization (WHO) Collaborating Centre for Drug Statistics Methodology. Terms & Conditions in https://www.whocc.no/use_of_atc_ddd/"
-* include codes from system WC
\ No newline at end of file
+* include codes from system http://www.whocc.no/atc
\ No newline at end of file
diff --git a/input/pagecontent/changes.md b/input/pagecontent/changes.md
index ecbc4efb..254bfd6a 100644
--- a/input/pagecontent/changes.md
+++ b/input/pagecontent/changes.md
@@ -6,7 +6,8 @@ Detailed change list for 2.0.0 since 1.1.0 includes:
 
 - **Compatible, Substantive Changes**
 
-- Reinstate revised ResultsSpecimenCollectionMethodUvIps value set (https://jira.hl7.org/browse/FHIR-46500)
+  - Reinstate revised ResultsSpecimenCollectionMethodUvIps value set (https://jira.hl7.org/browse/FHIR-46500)
+  - Remove "Target Site - IPS" value set (as per [FHIR-32809](https://jira.hl7.org/browse/FHIR-32809))
 
 - **Non-substantive Changes**