diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4941b8b8..bc4235a1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Removed
 
+- Removed `*_GridComp_ExtData.yaml` files. These have been migrated to the new `Aerosol_ExtData` repository.
+
 ### Changed
 
 ### Fixed
diff --git a/ESMF/GOCART2G_GridComp/CA2G_GridComp/AMIP/CA2G_GridComp_ExtData.yaml b/ESMF/GOCART2G_GridComp/CA2G_GridComp/AMIP/CA2G_GridComp_ExtData.yaml
deleted file mode 100644
index 3a2b9589..00000000
--- a/ESMF/GOCART2G_GridComp/CA2G_GridComp/AMIP/CA2G_GridComp_ExtData.yaml
+++ /dev/null
@@ -1,263 +0,0 @@
-Collections:
-  CA2G_BC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4:
-    template: ExtData/chemistry/CEDS/v2021-04-21-revised/L72/BC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4
-    valid_range: "1979-01-15T12:00/2019-12-15T12:00"
-  CA2G_BC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4:
-    template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/BC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4
-    valid_range: "1979-01-15T12:00/2019-12-15T12:00"
-  CA2G_BC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4:
-    template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/BC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4
-    valid_range: "1979-01-15T12:00/2019-12-15T12:00"
-  CA2G_BC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4:
-    template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/BC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4
-    valid_range: "1979-01-15T12:00/2019-12-15T12:00"
-  CA2G_OC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4:
-    template: ExtData/chemistry/CEDS/v2021-04-21-revised/L72/OC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4
-    valid_range: "1979-01-15T12:00/2019-12-15T12:00"
-  CA2G_OC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4:
-    template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/OC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4
-    valid_range: "1979-01-15T12:00/2019-12-15T12:00"
-  CA2G_OC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4:
-    template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/OC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4
-    valid_range: "1979-01-15T12:00/2019-12-15T12:00"
-  CA2G_OC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4:
-    template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/OC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4
-    valid_range: "1979-01-15T12:00/2019-12-15T12:00"
-  CA2G_merra2.aer_Nv.2003-2015.2008%m2clm.nc4:
-    template: ExtData/chemistry/MERRA2/v0.0.0/L72/merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-    valid_range: "2008-01-01T12:00:00/2008-12-15T12:00:00"
-  CA2G_qfed2.emis_bc.061.%y4%m2%d2.nc4:
-    template: ExtData/chemistry/QFED/v2.6r1/sfc/0.1/Y%y4/M%m2/qfed2.emis_bc.061.%y4%m2%d2.nc4
-    valid_range: "2000-02-29T12:00/2025-01-01"
-  CA2G_qfed2.emis_oc.061.%y4%m2%d2.nc4:
-    template: ExtData/chemistry/QFED/v2.6r1/sfc/0.1/Y%y4/M%m2/qfed2.emis_oc.061.%y4%m2%d2.nc4
-    valid_range: "2000-02-29T12:00/2025-01-01"
-  CA2G_hfed.emis_bc.x576_y361.%y4%m2.nc4:
-    template: ExtData/chemistry/HFED/v1.0/Y%y4/M%m2/hfed.emis_bc.x576_y361.%y4%m2.nc4
-    valid_range: "1960-01-16T12:00/2000-12-16T12:00"
-  CA2G_hfed.emis_oc.x576_y361.%y4%m2.nc4:
-    template: ExtData/chemistry/HFED/v1.0/Y%y4/M%m2/hfed.emis_oc.x576_y361.%y4%m2.nc4
-    valid_range: "1960-01-16T12:00/2000-12-16T12:00"
-
-Samplings:
-  CA2G_sample_0:
-    extrapolation: clim
-  CA2G_sample_1:
-    update_frequency: PT24H
-    update_offset: PT12H
-    update_reference_time: '0'
-  CA2G_sample_2:
-    extrapolation: clim
-    update_frequency: PT24H
-    update_offset: PT12H
-    update_reference_time: '0'
-  CA2G_sample_3:
-    extrapolation: clim
-    update_frequency: PT24H
-    update_offset: PT12H
-    update_reference_time: '0'
-    source_time: "2019-01-15T12:00/2019-12-15T00:00:00"
-
-Exports:
-  BC_AIRCRAFT:
-    - {starting: "1979-01-15T12:00", collection: CA2G_BC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4, sample: CA2G_sample_1, regrid: CONSERVE, variable: bc_aviation}
-    - {starting: "2019-12-15T12:00", collection: CA2G_BC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4, regrid: CONSERVE, sample: CA2G_sample_3, variable: bc_aviation}
-  BC_ANTEBC1:
-    - {starting: "1979-01-15T12:00", collection: CA2G_BC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4, sample: CA2G_sample_1, regrid: CONSERVE, variable: bc_nonenergy}
-    - {starting: "2019-12-15T12:00", collection: CA2G_BC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: CA2G_sample_3, variable: bc_nonenergy}
-  BC_ANTEBC2:
-    - {starting: "1979-01-15T12:00", collection: CA2G_BC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4, sample: CA2G_sample_1, regrid: CONSERVE, variable: bc_energy}
-    - {starting: "2019-12-15T12:00", collection: CA2G_BC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: CA2G_sample_3, variable: bc_energy}
-  BC_AVIATION_CDS:
-    collection: /dev/null
-    regrid: CONSERVE
-    sample: CA2G_sample_2
-    variable: bc_aviation
-  BC_AVIATION_CRS:
-    collection: /dev/null
-    regrid: CONSERVE
-    sample: CA2G_sample_2
-    variable: bc_aviation
-  BC_AVIATION_LTO:
-    collection: /dev/null
-    regrid: CONSERVE
-    sample: CA2G_sample_2
-    variable: bc_aviation
-  BC_BIOFUEL:
-    collection: /dev/null
-    regrid: CONSERVE
-    sample: CA2G_sample_2
-    variable: biofuel
-  BC_BIOMASS:
-    - {starting: "1960-01-16T12:00", collection: CA2G_hfed.emis_bc.x576_y361.%y4%m2.nc4, linear_transformation: [0.0, 0.778], regrid: CONSERVE, sample: CA2G_sample_1, variable: biomass}
-    - {starting: "2000-03-01T00:00", collection: CA2G_qfed2.emis_bc.061.%y4%m2%d2.nc4, linear_transformation: [0.0, 0.778], regrid: CONSERVE, sample: CA2G_sample_1, variable: biomass}
-  BC_SHIP:
-    - {starting: "1979-01-15T12:00", collection: CA2G_BC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4, sample: CA2G_sample_1, regrid: CONSERVE, variable: bc_shipping}
-    - {starting: "2019-12-15T12:00", collection: CA2G_BC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: CA2G_sample_3, variable: bc_shipping}
-  BRC_AIRCRAFT:
-    collection: /dev/null
-    regrid: CONSERVE
-    sample: CA2G_sample_2
-    variable: none
-  BRC_ANTEBRC1:
-    collection: /dev/null
-    regrid: CONSERVE
-    sample: CA2G_sample_2
-    variable: anteoc1
-  BRC_ANTEBRC2:
-    collection: /dev/null
-    regrid: CONSERVE
-    sample: CA2G_sample_2
-    variable: anteoc2
-  BRC_AVIATION_CDS:
-    collection: /dev/null
-    regrid: CONSERVE
-    sample: CA2G_sample_2
-    variable: oc_aviation
-  BRC_AVIATION_CRS:
-    collection: /dev/null
-    regrid: CONSERVE
-    sample: CA2G_sample_2
-    variable: oc_aviation
-  BRC_AVIATION_LTO:
-    collection: /dev/null
-    regrid: CONSERVE
-    sample: CA2G_sample_2
-    variable: oc_aviation
-  BRC_BIOFUEL:
-    collection: /dev/null
-    regrid: CONSERVE
-    sample: CA2G_sample_2
-    variable: biofuel
-  BRC_BIOMASS:
-    - {starting: "1960-01-16T12:00", collection: CA2G_hfed.emis_oc.x576_y361.%y4%m2.nc4, linear_transformation: [0.0, 0.778], regrid: CONSERVE, sample: CA2G_sample_1, variable: biomass}
-    - {starting: "2000-03-01T00:00", collection: CA2G_qfed2.emis_oc.061.%y4%m2%d2.nc4, linear_transformation: [0.0, 0.778], regrid: CONSERVE, sample: CA2G_sample_1, variable: biomass}
-  BRC_SHIP:
-    collection: /dev/null
-    regrid: CONSERVE
-    sample: CA2G_sample_2
-    variable: oc_ship
-  BRC_TERPENE:
-    collection: /dev/null
-    regrid: CONSERVE
-    sample: CA2G_sample_2
-    variable: terpene
-  OC_AIRCRAFT:
-    - {starting: "1979-01-15T12:00", collection: CA2G_OC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4, sample: CA2G_sample_1, regrid: CONSERVE, variable: oc_aviation}
-    - {starting: "2019-12-15T12:00", collection: CA2G_OC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4, regrid: CONSERVE, sample: CA2G_sample_3, variable: oc_aviation}
-  OC_ANTEOC1:
-    - {starting: "1979-01-15T12:00", collection: CA2G_OC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4, sample: CA2G_sample_1, regrid: CONSERVE, variable: oc_nonenergy}
-    - {starting: "2019-12-15T12:00", collection: CA2G_OC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: CA2G_sample_3, variable: oc_nonenergy}
-  OC_ANTEOC2:
-    - {starting: "1979-01-15T12:00", collection: CA2G_OC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4, sample: CA2G_sample_1, regrid: CONSERVE, variable: oc_energy}
-    - {starting: "2019-12-15T12:00", collection: CA2G_OC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: CA2G_sample_3, variable: oc_energy}
-  OC_AVIATION_CDS:
-    collection: /dev/null
-    regrid: CONSERVE
-    sample: CA2G_sample_2
-    variable: oc_aviation
-  OC_AVIATION_CRS:
-    collection: /dev/null
-    regrid: CONSERVE
-    sample: CA2G_sample_2
-    variable: oc_aviation
-  OC_AVIATION_LTO:
-    collection: /dev/null
-    regrid: CONSERVE
-    sample: CA2G_sample_2
-    variable: oc_aviation
-  OC_BIOFUEL:
-    collection: /dev/null
-    regrid: CONSERVE
-    sample: CA2G_sample_2
-    variable: biofuel
-  OC_BIOMASS:
-    collection: /dev/null
-    linear_transformation:
-      - 0.0
-      - 0.778
-    regrid: CONSERVE
-    sample: CA2G_sample_1
-    variable: biomass
-  OC_SHIP:
-    - {starting: "1979-01-15T12:00", collection: CA2G_OC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4, sample: CA2G_sample_1, regrid: CONSERVE, variable: oc_shipping}
-    - {starting: "2019-12-15T12:00", collection: CA2G_OC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: CA2G_sample_3, variable: oc_shipping}
-  climBCDP001:
-    collection: /dev/null
-  climBCDP002:
-    collection: /dev/null
-  climBCSD001:
-    collection: /dev/null
-  climBCSD002:
-    collection: /dev/null
-  climBCSV001:
-    collection: /dev/null
-  climBCSV002:
-    collection: /dev/null
-  climBCWT001:
-    collection: /dev/null
-  climBCWT002:
-    collection: /dev/null
-  climBCphilic:
-    collection: CA2G_merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-    sample: CA2G_sample_0
-    variable: BCPHILIC
-  climBCphobic:
-    collection: CA2G_merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-    sample: CA2G_sample_0
-    variable: BCPHOBIC
-  climBRDP001:
-    collection: /dev/null
-  climBRDP002:
-    collection: /dev/null
-  climBRSD001:
-    collection: /dev/null
-  climBRSD002:
-    collection: /dev/null
-  climBRSV001:
-    collection: /dev/null
-  climBRSV002:
-    collection: /dev/null
-  climBRWT001:
-    collection: /dev/null
-  climBRWT002:
-    collection: /dev/null
-  climBRphilic:
-    collection: /dev/null
-  climBRphobic:
-    collection: /dev/null
-  climOCDP001:
-    collection: /dev/null
-  climOCDP002:
-    collection: /dev/null
-  climOCSD001:
-    collection: /dev/null
-  climOCSD002:
-    collection: /dev/null
-  climOCSV001:
-    collection: /dev/null
-  climOCSV002:
-    collection: /dev/null
-  climOCWT001:
-    collection: /dev/null
-  climOCWT002:
-    collection: /dev/null
-  climOCphilic:
-    collection: CA2G_merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-    sample: CA2G_sample_0
-    variable: OCPHILIC
-  climOCphobic:
-    collection: CA2G_merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-    sample: CA2G_sample_0
-    variable: OCPHOBIC
-  pSOA_ANTHRO_VOC:
-    collection: /dev/null
-    regrid: CONSERVE
-    sample: CA2G_sample_2
-    variable: biofuel
-  pSOA_BIOB_VOC:
-    collection: /dev/null
-    regrid: CONSERVE
-    sample: CA2G_sample_2
-    variable: biofuel
-
diff --git a/ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_GridComp_ExtData.yaml b/ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_GridComp_ExtData.yaml
deleted file mode 100644
index d04c1445..00000000
--- a/ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_GridComp_ExtData.yaml
+++ /dev/null
@@ -1,276 +0,0 @@
-Collections:
-  CA2G_BC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4:
-    template: ExtData/chemistry/CEDS/v2021-04-21-revised/L72/BC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4
-    valid_range: "1979-01-15T12:00/2019-12-15T12:00"
-  CA2G_BC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4:
-    template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/BC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4
-    valid_range: "1979-01-15T12:00/2019-12-15T12:00"
-  CA2G_BC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4:
-    template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/BC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4
-    valid_range: "1979-01-15T12:00/2019-12-15T12:00"
-  CA2G_BC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4:
-    template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/BC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4
-    valid_range: "1979-01-15T12:00/2019-12-15T12:00"
-  CA2G_OC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4:
-    template: ExtData/chemistry/CEDS/v2021-04-21-revised/L72/OC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4
-    valid_range: "1979-01-15T12:00/2019-12-15T12:00"
-  CA2G_OC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4:
-    template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/OC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4
-    valid_range: "1979-01-15T12:00/2019-12-15T12:00"
-  CA2G_OC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4:
-    template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/OC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4
-    valid_range: "1979-01-15T12:00/2019-12-15T12:00"
-  CA2G_OC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4:
-    template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/OC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4
-    valid_range: "1979-01-15T12:00/2019-12-15T12:00"
-  CA2G_merra2.aer_Nv.2003-2015.2008%m2clm.nc4:
-    template: ExtData/chemistry/MERRA2/v0.0.0/L72/merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-  CA2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4:
-    template: ExtData/chemistry/MERRA2/v0.0.0/sfc/merra2.aer_Nx.2003-2015.2008%m2clm.nc4
-  CA2G_qfed2.emis_bc.006.%y4%m2%d2.nc4:
-    template: ExtData/chemistry/QFED/v2.5r1-nrt/sfc/0.1/Y%y4/M%m2/qfed2.emis_bc.006.%y4%m2%d2.nc4
-    valid_range: "2014-12-01T12:00/2021-11-01T12:00"
-  CA2G_qfed2.emis_oc.006.%y4%m2%d2.nc4:
-    template: ExtData/chemistry/QFED/v2.5r1-nrt/sfc/0.1/Y%y4/M%m2/qfed2.emis_oc.006.%y4%m2%d2.nc4
-    valid_range: "2014-12-01T12:00/2021-11-01T12:00"
-  CA2G_qfed2.emis_bc.061.%y4%m2%d2.nc4:
-    template: ExtData/chemistry/QFED/v2.5r1-nrt/sfc/0.1/Y%y4/M%m2/qfed2.emis_bc.061.%y4%m2%d2.nc4
-    valid_range: "2021-11-01T12:00/2025-01-01"
-  CA2G_qfed2.emis_oc.061.%y4%m2%d2.nc4:
-    template: ExtData/chemistry/QFED/v2.5r1-nrt/sfc/0.1/Y%y4/M%m2/qfed2.emis_oc.061.%y4%m2%d2.nc4
-    valid_range: "2021-11-01T12:00/2025-01-01"
-
-Samplings:
-  CA2G_sample_0:
-    extrapolation: clim
-  CA2G_sample_1:
-    update_frequency: PT24H
-    update_offset: PT12H
-    update_reference_time: '0'
-  CA2G_sample_2:
-    extrapolation: clim
-    update_frequency: PT24H
-    update_offset: PT12H
-    update_reference_time: '0'
-  CA2G_sample_3:
-    extrapolation: clim
-    update_frequency: PT24H
-    update_offset: PT12H
-    update_reference_time: '0'
-    source_time: "2019-01-15T12:00/2019-12-15T00:00:00"
-
-Exports:
-  BC_AIRCRAFT:
-    - {starting: "1979-01-15T12:00", collection: CA2G_BC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4, sample: CA2G_sample_1, regrid: CONSERVE, variable: bc_aviation}
-    - {starting: "2019-12-15T12:00", collection: CA2G_BC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4, regrid: CONSERVE, sample: CA2G_sample_3, variable: bc_aviation}
-  BC_ANTEBC1:
-    - {starting: "1979-01-15T12:00", collection: CA2G_BC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4, sample: CA2G_sample_1, regrid: CONSERVE, variable: bc_nonenergy}
-    - {starting: "2019-12-15T12:00", collection: CA2G_BC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: CA2G_sample_3, variable: bc_nonenergy}
-  BC_ANTEBC2:
-    - {starting: "1979-01-15T12:00", collection: CA2G_BC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4, sample: CA2G_sample_1, regrid: CONSERVE, variable: bc_energy}
-    - {starting: "2019-12-15T12:00", collection: CA2G_BC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: CA2G_sample_3, variable: bc_energy}
-  BC_AVIATION_CDS:
-    collection: /dev/null
-    regrid: CONSERVE
-    sample: CA2G_sample_2
-    variable: bc_aviation
-  BC_AVIATION_CRS:
-    collection: /dev/null
-    regrid: CONSERVE
-    sample: CA2G_sample_2
-    variable: bc_aviation
-  BC_AVIATION_LTO:
-    collection: /dev/null
-    regrid: CONSERVE
-    sample: CA2G_sample_2
-    variable: bc_aviation
-  BC_BIOFUEL:
-    collection: /dev/null
-    regrid: CONSERVE
-    sample: CA2G_sample_2
-    variable: biofuel
-  BC_BIOMASS:
-    - {starting: "2014-12-01T12:00", collection: CA2G_qfed2.emis_bc.006.%y4%m2%d2.nc4, linear_transformation: [0.0, 0.778], regrid: CONSERVE, sample: CA2G_sample_1, variable: biomass}
-    - {starting: "2021-11-01T12:00", collection: CA2G_qfed2.emis_bc.061.%y4%m2%d2.nc4, linear_transformation: [0.0, 0.778], regrid: CONSERVE, sample: CA2G_sample_1, variable: biomass}
-  BC_SHIP:
-    - {starting: "1979-01-15T12:00", collection: CA2G_BC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4, sample: CA2G_sample_1, regrid: CONSERVE, variable: bc_shipping}
-    - {starting: "2019-12-15T12:00", collection: CA2G_BC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: CA2G_sample_3, variable: bc_shipping}
-  BRC_AIRCRAFT:
-    collection: /dev/null
-    regrid: CONSERVE
-    sample: CA2G_sample_2
-    variable: none
-  BRC_ANTEBRC1:
-    collection: /dev/null
-    regrid: CONSERVE
-    sample: CA2G_sample_2
-    variable: anteoc1
-  BRC_ANTEBRC2:
-    collection: /dev/null
-    regrid: CONSERVE
-    sample: CA2G_sample_2
-    variable: anteoc2
-  BRC_AVIATION_CDS:
-    collection: /dev/null
-    regrid: CONSERVE
-    sample: CA2G_sample_2
-    variable: oc_aviation
-  BRC_AVIATION_CRS:
-    collection: /dev/null
-    regrid: CONSERVE
-    sample: CA2G_sample_2
-    variable: oc_aviation
-  BRC_AVIATION_LTO:
-    collection: /dev/null
-    regrid: CONSERVE
-    sample: CA2G_sample_2
-    variable: oc_aviation
-  BRC_BIOFUEL:
-    collection: /dev/null
-    regrid: CONSERVE
-    sample: CA2G_sample_2
-    variable: biofuel
-  BRC_BIOMASS:
-    - {starting: "2014-12-01T12:00", collection: CA2G_qfed2.emis_oc.006.%y4%m2%d2.nc4, linear_transformation: [0.0, 0.778], regrid: CONSERVE, sample: CA2G_sample_1, variable: biomass}
-    - {starting: "2021-11-01T12:00", collection: CA2G_qfed2.emis_oc.061.%y4%m2%d2.nc4, linear_transformation: [0.0, 0.778], regrid: CONSERVE, sample: CA2G_sample_1, variable: biomass}
-  BRC_SHIP:
-    collection: /dev/null
-    regrid: CONSERVE
-    sample: CA2G_sample_2
-    variable: oc_ship
-  BRC_TERPENE:
-    collection: /dev/null
-    regrid: CONSERVE
-    sample: CA2G_sample_2
-    variable: terpene
-  OC_AIRCRAFT:
-    - {starting: "1979-01-15T12:00", collection: CA2G_OC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4, sample: CA2G_sample_1, regrid: CONSERVE, variable: oc_aviation}
-    - {starting: "2019-12-15T12:00", collection: CA2G_OC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4, regrid: CONSERVE, sample: CA2G_sample_3, variable: oc_aviation}
-  OC_ANTEOC1:
-    - {starting: "1979-01-15T12:00", collection: CA2G_OC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4, sample: CA2G_sample_1, regrid: CONSERVE, variable: oc_nonenergy}
-    - {starting: "2019-12-15T12:00", collection: CA2G_OC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: CA2G_sample_3, variable: oc_nonenergy}
-  OC_ANTEOC2:
-    - {starting: "1979-01-15T12:00", collection: CA2G_OC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4, sample: CA2G_sample_1, regrid: CONSERVE, variable: oc_energy}
-    - {starting: "2019-12-15T12:00", collection: CA2G_OC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: CA2G_sample_3, variable: oc_energy}
-  OC_AVIATION_CDS:
-    collection: /dev/null
-    regrid: CONSERVE
-    sample: CA2G_sample_2
-    variable: oc_aviation
-  OC_AVIATION_CRS:
-    collection: /dev/null
-    regrid: CONSERVE
-    sample: CA2G_sample_2
-    variable: oc_aviation
-  OC_AVIATION_LTO:
-    collection: /dev/null
-    regrid: CONSERVE
-    sample: CA2G_sample_2
-    variable: oc_aviation
-  OC_BIOFUEL:
-    collection: /dev/null
-    regrid: CONSERVE
-    sample: CA2G_sample_2
-    variable: biofuel
-  OC_BIOMASS:
-    collection: /dev/null
-    linear_transformation:
-      - 0.0
-      - 0.778
-    regrid: CONSERVE
-    sample: CA2G_sample_1
-    variable: biomass
-  OC_SHIP:
-    - {starting: "1979-01-15T12:00", collection: CA2G_OC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4, sample: CA2G_sample_1, regrid: CONSERVE, variable: oc_shipping}
-    - {starting: "2019-12-15T12:00", collection: CA2G_OC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: CA2G_sample_3, variable: oc_shipping}
-  climBCDP001:
-    collection: CA2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4
-    sample: CA2G_sample_0
-    variable: BCDP001
-  climBCDP002:
-    collection: CA2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4
-    sample: CA2G_sample_0
-    variable: BCDP002
-  climBCSD001:
-    collection: /dev/null
-    sample: CA2G_sample_0
-    variable: BCSD001
-  climBCSD002:
-    collection: /dev/null
-    sample: CA2G_sample_0
-    variable: BCSD002
-  climBCSV001:
-    collection: CA2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4
-    sample: CA2G_sample_0
-    variable: BCSV001
-  climBCSV002:
-    collection: CA2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4
-    sample: CA2G_sample_0
-    variable: BCSV002
-  climBCWT001:
-    collection: CA2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4
-    sample: CA2G_sample_0
-    variable: BCWT001
-  climBCWT002:
-    collection: CA2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4
-    sample: CA2G_sample_0
-    variable: BCWT002
-  climBCphilic:
-    collection: CA2G_merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-    sample: CA2G_sample_0
-    variable: BCphilic
-  climBCphobic:
-    collection: CA2G_merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-    sample: CA2G_sample_0
-    variable: BCphobic
-  climOCDP001:
-    collection: CA2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4
-    sample: CA2G_sample_0
-    variable: OCDP001
-  climOCDP002:
-    collection: CA2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4
-    sample: CA2G_sample_0
-    variable: OCDP002
-  climOCSD001:
-    collection: /dev/null
-    sample: CA2G_sample_0
-    variable: OCSD001
-  climOCSD002:
-    collection: /dev/null
-    sample: CA2G_sample_0
-    variable: OCSD002
-  climOCSV001:
-    collection: CA2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4
-    sample: CA2G_sample_0
-    variable: OCSV001
-  climOCSV002:
-    collection: CA2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4
-    sample: CA2G_sample_0
-    variable: OCSV002
-  climOCWT001:
-    collection: CA2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4
-    sample: CA2G_sample_0
-    variable: OCWT001
-  climOCWT002:
-    collection: CA2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4
-    sample: CA2G_sample_0
-    variable: OCWT002
-  climOCphilic:
-    collection: CA2G_merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-    sample: CA2G_sample_0
-    variable: OCphilic
-  climOCphobic:
-    collection: CA2G_merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-    sample: CA2G_sample_0
-    variable: OCphobic
-  pSOA_ANTHRO_VOC:
-    collection: /dev/null
-    regrid: CONSERVE
-    sample: CA2G_sample_2
-    variable: biofuel
-  pSOA_BIOB_VOC:
-    collection: /dev/null
-    regrid: CONSERVE
-    sample: CA2G_sample_2
-    variable: biofuel
-
diff --git a/ESMF/GOCART2G_GridComp/CA2G_GridComp/CMakeLists.txt b/ESMF/GOCART2G_GridComp/CA2G_GridComp/CMakeLists.txt
index 83bb6024..677e080f 100644
--- a/ESMF/GOCART2G_GridComp/CA2G_GridComp/CMakeLists.txt
+++ b/ESMF/GOCART2G_GridComp/CA2G_GridComp/CMakeLists.txt
@@ -10,7 +10,7 @@ mapl_acg (${this}   CA2G_StateSpecs.rc
           LONG_NAME_PREFIX "GCsuffix")
 
 
-file (GLOB_RECURSE rc_files CONFIGURE_DEPENDS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.rc *.yaml)
+file (GLOB_RECURSE rc_files CONFIGURE_DEPENDS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.rc)
 foreach ( file ${rc_files} )
    get_filename_component( dir ${file} DIRECTORY )
    install( FILES ${file} DESTINATION etc/${dir} )
diff --git a/ESMF/GOCART2G_GridComp/DU2G_GridComp/AMIP/DU2G_GridComp_ExtData.yaml b/ESMF/GOCART2G_GridComp/DU2G_GridComp/AMIP/DU2G_GridComp_ExtData.yaml
deleted file mode 100644
index 69df0e8f..00000000
--- a/ESMF/GOCART2G_GridComp/DU2G_GridComp/AMIP/DU2G_GridComp_ExtData.yaml
+++ /dev/null
@@ -1,130 +0,0 @@
-Collections:
-  DU2G__gldas-fao.soil_category.x1152_y721_t1.nc4:
-    template: ExtData/chemistry/DUST/v0.0.0/sfc/_gldas-fao.soil_category.x1152_y721_t1.nc4
-  DU2G__gldas-fao.soil_texture.x1152_y721_t1.nc4:
-    template: ExtData/chemistry/DUST/v0.0.0/sfc/_gldas-fao.soil_texture.x1152_y721_t1.nc4
-  DU2G_arlems-roughness.x1151_y720_t1.nc4:
-    template: ExtData/chemistry/DUST/v0.0.0/sfc/arlems-roughness.x1151_y720_t1.nc4
-  DU2G_gocart.dust_source.v5a.x1152_y721.nc:
-    template: ExtData/chemistry/DUST/v0.0.0/sfc/gocart.dust_source.v5a.x1152_y721.nc
-  DU2G_merra2.aer_Nv.2003-2015.2008%m2clm.nc4:
-    template: ExtData/chemistry/MERRA2/v0.0.0/L72/merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-    valid_range: "2008-01-01T12:00:00/2008-12-15T12:00:00"
-  DU2G_qvi.006.%y4.nc4:
-    template: ExtData/chemistry/NDVI/v1.0.r3/sfc/qvi.006.%y4.nc4
-  DU2G_veg20.x1152_y721_t1.nc4:
-    template: ExtData/chemistry/DUST/v0.0.0/sfc/veg20.x1152_y721_t1.nc4
-
-Samplings:
-  DU2G_sample_0:
-    extrapolation: persist_closest
-  DU2G_sample_1:
-    update_frequency: PT24H
-    update_offset: PT12H
-    update_reference_time: '0'
-  DU2G_sample_2:
-    extrapolation: clim
-
-Exports:
-  DU_CLAY:
-    collection: DU2G__gldas-fao.soil_texture.x1152_y721_t1.nc4
-    regrid: CONSERVE
-    sample: DU2G_sample_0
-    variable: clay
-  DU_GVF:
-    collection: DU2G_qvi.006.%y4.nc4
-    regrid: CONSERVE
-    sample: DU2G_sample_1
-    variable: gvf
-  DU_SAND:
-    collection: DU2G__gldas-fao.soil_texture.x1152_y721_t1.nc4
-    regrid: CONSERVE
-    sample: DU2G_sample_0
-    variable: sand
-  DU_SILT:
-    collection: DU2G__gldas-fao.soil_texture.x1152_y721_t1.nc4
-    regrid: CONSERVE
-    sample: DU2G_sample_0
-    variable: silt
-  DU_SRC:
-    collection: DU2G_gocart.dust_source.v5a.x1152_y721.nc
-    regrid: CONSERVE
-    sample: DU2G_sample_0
-    variable: du_src
-  DU_TEXTURE:
-    collection: DU2G__gldas-fao.soil_category.x1152_y721_t1.nc4
-    regrid: VOTE
-    sample: DU2G_sample_0
-    variable: texture
-  DU_VEG:
-    collection: DU2G_veg20.x1152_y721_t1.nc4
-    regrid: VOTE
-    sample: DU2G_sample_0
-    variable: domveg
-  DU_Z0:
-    collection: DU2G_arlems-roughness.x1151_y720_t1.nc4
-    regrid: CONSERVE
-    sample: DU2G_sample_0
-    variable: roughness
-  climDUDP001:
-    collection: /dev/null
-  climDUDP002:
-    collection: /dev/null
-  climDUDP003:
-    collection: /dev/null
-  climDUDP004:
-    collection: /dev/null
-  climDUDP005:
-    collection: /dev/null
-  climDUSD001:
-    collection: /dev/null
-  climDUSD002:
-    collection: /dev/null
-  climDUSD003:
-    collection: /dev/null
-  climDUSD004:
-    collection: /dev/null
-  climDUSD005:
-    collection: /dev/null
-  climDUSV001:
-    collection: /dev/null
-  climDUSV002:
-    collection: /dev/null
-  climDUSV003:
-    collection: /dev/null
-  climDUSV004:
-    collection: /dev/null
-  climDUSV005:
-    collection: /dev/null
-  climDUWT001:
-    collection: /dev/null
-  climDUWT002:
-    collection: /dev/null
-  climDUWT003:
-    collection: /dev/null
-  climDUWT004:
-    collection: /dev/null
-  climDUWT005:
-    collection: /dev/null
-  climdu001:
-    collection: DU2G_merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-    sample: DU2G_sample_2
-    variable: DU001
-  climdu002:
-    collection: DU2G_merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-    sample: DU2G_sample_2
-    variable: DU002
-  climdu003:
-    collection: DU2G_merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-    sample: DU2G_sample_2
-    variable: DU003
-  climdu004:
-    collection: DU2G_merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-    sample: DU2G_sample_2
-    variable: DU004
-  climdu005:
-    collection: DU2G_merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-    sample: DU2G_sample_2
-    variable: DU005
-
-
diff --git a/ESMF/GOCART2G_GridComp/DU2G_GridComp/CMakeLists.txt b/ESMF/GOCART2G_GridComp/DU2G_GridComp/CMakeLists.txt
index ac8e86f5..6146117c 100644
--- a/ESMF/GOCART2G_GridComp/DU2G_GridComp/CMakeLists.txt
+++ b/ESMF/GOCART2G_GridComp/DU2G_GridComp/CMakeLists.txt
@@ -8,7 +8,7 @@ mapl_acg (${this}   DU2G_StateSpecs.rc
           IMPORT_SPECS EXPORT_SPECS INTERNAL_SPECS
           GET_POINTERS DECLARE_POINTERS)
 
-file (GLOB_RECURSE rc_files CONFIGURE_DEPENDS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.rc *.yaml)
+file (GLOB_RECURSE rc_files CONFIGURE_DEPENDS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.rc)
 foreach ( file ${rc_files} )
    get_filename_component( dir ${file} DIRECTORY )
    install( FILES ${file} DESTINATION etc/${dir} )
diff --git a/ESMF/GOCART2G_GridComp/DU2G_GridComp/DU2G_GridComp_ExtData.yaml b/ESMF/GOCART2G_GridComp/DU2G_GridComp/DU2G_GridComp_ExtData.yaml
deleted file mode 100644
index 69df0e8f..00000000
--- a/ESMF/GOCART2G_GridComp/DU2G_GridComp/DU2G_GridComp_ExtData.yaml
+++ /dev/null
@@ -1,130 +0,0 @@
-Collections:
-  DU2G__gldas-fao.soil_category.x1152_y721_t1.nc4:
-    template: ExtData/chemistry/DUST/v0.0.0/sfc/_gldas-fao.soil_category.x1152_y721_t1.nc4
-  DU2G__gldas-fao.soil_texture.x1152_y721_t1.nc4:
-    template: ExtData/chemistry/DUST/v0.0.0/sfc/_gldas-fao.soil_texture.x1152_y721_t1.nc4
-  DU2G_arlems-roughness.x1151_y720_t1.nc4:
-    template: ExtData/chemistry/DUST/v0.0.0/sfc/arlems-roughness.x1151_y720_t1.nc4
-  DU2G_gocart.dust_source.v5a.x1152_y721.nc:
-    template: ExtData/chemistry/DUST/v0.0.0/sfc/gocart.dust_source.v5a.x1152_y721.nc
-  DU2G_merra2.aer_Nv.2003-2015.2008%m2clm.nc4:
-    template: ExtData/chemistry/MERRA2/v0.0.0/L72/merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-    valid_range: "2008-01-01T12:00:00/2008-12-15T12:00:00"
-  DU2G_qvi.006.%y4.nc4:
-    template: ExtData/chemistry/NDVI/v1.0.r3/sfc/qvi.006.%y4.nc4
-  DU2G_veg20.x1152_y721_t1.nc4:
-    template: ExtData/chemistry/DUST/v0.0.0/sfc/veg20.x1152_y721_t1.nc4
-
-Samplings:
-  DU2G_sample_0:
-    extrapolation: persist_closest
-  DU2G_sample_1:
-    update_frequency: PT24H
-    update_offset: PT12H
-    update_reference_time: '0'
-  DU2G_sample_2:
-    extrapolation: clim
-
-Exports:
-  DU_CLAY:
-    collection: DU2G__gldas-fao.soil_texture.x1152_y721_t1.nc4
-    regrid: CONSERVE
-    sample: DU2G_sample_0
-    variable: clay
-  DU_GVF:
-    collection: DU2G_qvi.006.%y4.nc4
-    regrid: CONSERVE
-    sample: DU2G_sample_1
-    variable: gvf
-  DU_SAND:
-    collection: DU2G__gldas-fao.soil_texture.x1152_y721_t1.nc4
-    regrid: CONSERVE
-    sample: DU2G_sample_0
-    variable: sand
-  DU_SILT:
-    collection: DU2G__gldas-fao.soil_texture.x1152_y721_t1.nc4
-    regrid: CONSERVE
-    sample: DU2G_sample_0
-    variable: silt
-  DU_SRC:
-    collection: DU2G_gocart.dust_source.v5a.x1152_y721.nc
-    regrid: CONSERVE
-    sample: DU2G_sample_0
-    variable: du_src
-  DU_TEXTURE:
-    collection: DU2G__gldas-fao.soil_category.x1152_y721_t1.nc4
-    regrid: VOTE
-    sample: DU2G_sample_0
-    variable: texture
-  DU_VEG:
-    collection: DU2G_veg20.x1152_y721_t1.nc4
-    regrid: VOTE
-    sample: DU2G_sample_0
-    variable: domveg
-  DU_Z0:
-    collection: DU2G_arlems-roughness.x1151_y720_t1.nc4
-    regrid: CONSERVE
-    sample: DU2G_sample_0
-    variable: roughness
-  climDUDP001:
-    collection: /dev/null
-  climDUDP002:
-    collection: /dev/null
-  climDUDP003:
-    collection: /dev/null
-  climDUDP004:
-    collection: /dev/null
-  climDUDP005:
-    collection: /dev/null
-  climDUSD001:
-    collection: /dev/null
-  climDUSD002:
-    collection: /dev/null
-  climDUSD003:
-    collection: /dev/null
-  climDUSD004:
-    collection: /dev/null
-  climDUSD005:
-    collection: /dev/null
-  climDUSV001:
-    collection: /dev/null
-  climDUSV002:
-    collection: /dev/null
-  climDUSV003:
-    collection: /dev/null
-  climDUSV004:
-    collection: /dev/null
-  climDUSV005:
-    collection: /dev/null
-  climDUWT001:
-    collection: /dev/null
-  climDUWT002:
-    collection: /dev/null
-  climDUWT003:
-    collection: /dev/null
-  climDUWT004:
-    collection: /dev/null
-  climDUWT005:
-    collection: /dev/null
-  climdu001:
-    collection: DU2G_merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-    sample: DU2G_sample_2
-    variable: DU001
-  climdu002:
-    collection: DU2G_merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-    sample: DU2G_sample_2
-    variable: DU002
-  climdu003:
-    collection: DU2G_merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-    sample: DU2G_sample_2
-    variable: DU003
-  climdu004:
-    collection: DU2G_merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-    sample: DU2G_sample_2
-    variable: DU004
-  climdu005:
-    collection: DU2G_merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-    sample: DU2G_sample_2
-    variable: DU005
-
-
diff --git a/ESMF/GOCART2G_GridComp/NI2G_GridComp/AMIP/NI2G_GridComp_ExtData.yaml b/ESMF/GOCART2G_GridComp/NI2G_GridComp/AMIP/NI2G_GridComp_ExtData.yaml
deleted file mode 100644
index 73b882f5..00000000
--- a/ESMF/GOCART2G_GridComp/NI2G_GridComp/AMIP/NI2G_GridComp_ExtData.yaml
+++ /dev/null
@@ -1,92 +0,0 @@
-Collections:
-  NI2G_ARCTAS.region_mask.x540_y361.2008.nc:
-    template: ExtData/chemistry/Masks/v0.0.0/sfc/ARCTAS.region_mask.x540_y361.2008.nc
-  NI2G_GEIA.emis_NH3.ocean.x576_y361.t12.20080715_12z.nc4:
-    template: ExtData/chemistry/GEIA/v0.0.0/sfc/GEIA.emis_NH3.ocean.x576_y361.t12.20080715_12z.nc4
-  NI2G_MERRA2_GMI.tavg24_3d_dac_Nv.x576_y361_t12.%y4.nc4:
-    template: ExtData/chemistry/MERRA2GMI/v0.0.0/L72/MERRA2_GMI.tavg24_3d_dac_Nv.x576_y361_t12.%y4.nc4
-  NI2G_NH3-em-anthro_CMIP_CEDS_gn.x2304_y1441_t12.%y4.nc4:
-    template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/NH3-em-anthro_CMIP_CEDS_gn.x2304_y1441_t12.%y4.nc4
-    valid_range: "1979-01-15T12:00/2019-12-15T12:00"
-  NI2G_qfed2.emis_nh3.061.%y4%m2%d2.nc4:
-    template: ExtData/chemistry/QFED/v2.6r1/sfc/0.1/Y%y4/M%m2/qfed2.emis_nh3.061.%y4%m2%d2.nc4
-    valid_range: "2000-02-29T12:00/2025-01-01"
-  NI2G_hfed.emis_nh3.x576_y361.%y4%m2.nc4:
-    template: ExtData/chemistry/HFED/v1.0/Y%y4/M%m2/hfed.emis_nh3.x576_y361.%y4%m2.nc4
-    valid_range: "1960-01-16T12:00/2000-12-16T12:00"
-
-Samplings:
-  NI2G_sample_0:
-    time_interpolation: False
-  NI2G_sample_1:
-    update_frequency: PT24H
-    update_offset: PT12H
-    update_reference_time: '0'
-  NI2G_sample_2:
-    extrapolation: clim
-    update_frequency: PT24H
-    update_offset: PT12H
-    update_reference_time: '0'
-  NI2G_sample_3:
-    extrapolation: persist_closest
-  NI2G_sample_4:
-    update_frequency: PT24H
-    update_offset: PT12H
-    update_reference_time: '0'
-    source_time: "2019-01-15T12:00/2019-12-15T00:00:00"
-
-Exports:
-  EMI_NH3_AG:
-    collection: /dev/null
-    regrid: CONSERVE
-    sample: NI2G_sample_2
-    variable: nh3_emis
-  EMI_NH3_BB:
-    - {starting: "1960-01-16T12:00", collection: NI2G_hfed.emis_nh3.x576_y361.%y4%m2.nc4, linear_transformation: [0.0, 0.778], regrid: CONSERVE, sample: NI2G_sample_1, variable: biomass}
-    - {starting: "2000-03-01T00:00", collection: NI2G_qfed2.emis_nh3.061.%y4%m2%d2.nc4, linear_transformation: [0.0, 0.778], regrid: CONSERVE, sample: NI2G_sample_1, variable: biomass}
-  EMI_NH3_EN:
-    - {starting: "1979-01-15T12:00", collection: NI2G_NH3-em-anthro_CMIP_CEDS_gn.x2304_y1441_t12.%y4.nc4, sample: NI2G_sample_1, regrid: CONSERVE, variable: nh3}
-    - {starting: "2019-12-15T12:00", collection: NI2G_NH3-em-anthro_CMIP_CEDS_gn.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: NI2G_sample_4, variable: nh3}
-  EMI_NH3_IN:
-    collection: /dev/null
-    regrid: CONSERVE
-    sample: NI2G_sample_2
-    variable: nh3_emis
-  EMI_NH3_OC:
-    collection: NI2G_GEIA.emis_NH3.ocean.x576_y361.t12.20080715_12z.nc4
-    regrid: CONSERVE
-    sample: NI2G_sample_2
-    variable: emiss_ocn
-  EMI_NH3_RE:
-    collection: /dev/null
-    regrid: CONSERVE
-    sample: NI2G_sample_2
-    variable: nh3_emis
-  EMI_NH3_TR:
-    collection: /dev/null
-    regrid: CONSERVE
-    sample: NI2G_sample_2
-    variable: nh3_emis
-  NITRATE_HNO3:
-    collection: NI2G_MERRA2_GMI.tavg24_3d_dac_Nv.x576_y361_t12.%y4.nc4
-    linear_transformation:
-      - 0.0
-      - 0.2
-    sample: NI2G_sample_1
-    variable: hno3
-  NI_regionMask:
-    collection: NI2G_ARCTAS.region_mask.x540_y361.2008.nc
-    regrid: VOTE
-    sample: NI2G_sample_3
-    variable: REGION_MASK
-  climNO3an1:
-    collection: /dev/null
-  climNO3an2:
-    collection: /dev/null
-  climNO3an3:
-    collection: /dev/null
-  GMI_HNO3:
-    collection: /dev/null
-    regrid: CONSERVE
-    sample: NI2G_sample_2
-    variable: GMI_HNO3
diff --git a/ESMF/GOCART2G_GridComp/NI2G_GridComp/CMakeLists.txt b/ESMF/GOCART2G_GridComp/NI2G_GridComp/CMakeLists.txt
index bbacc0de..f1f86ff2 100644
--- a/ESMF/GOCART2G_GridComp/NI2G_GridComp/CMakeLists.txt
+++ b/ESMF/GOCART2G_GridComp/NI2G_GridComp/CMakeLists.txt
@@ -8,7 +8,7 @@ mapl_acg (${this}   NI2G_StateSpecs.rc
           IMPORT_SPECS EXPORT_SPECS INTERNAL_SPECS
           GET_POINTERS DECLARE_POINTERS)
 
-file (GLOB_RECURSE rc_files CONFIGURE_DEPENDS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.rc *.yaml)
+file (GLOB_RECURSE rc_files CONFIGURE_DEPENDS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.rc)
 foreach ( file ${rc_files} )
    get_filename_component( dir ${file} DIRECTORY )
    install( FILES ${file} DESTINATION etc/${dir} )
diff --git a/ESMF/GOCART2G_GridComp/NI2G_GridComp/NI2G_GridComp_ExtData.yaml b/ESMF/GOCART2G_GridComp/NI2G_GridComp/NI2G_GridComp_ExtData.yaml
deleted file mode 100644
index 6a64a36f..00000000
--- a/ESMF/GOCART2G_GridComp/NI2G_GridComp/NI2G_GridComp_ExtData.yaml
+++ /dev/null
@@ -1,103 +0,0 @@
-Collections:
-  NI2G_ARCTAS.region_mask.x540_y361.2008.nc:
-    template: ExtData/chemistry/Masks/v0.0.0/sfc/ARCTAS.region_mask.x540_y361.2008.nc
-  NI2G_GEIA.emis_NH3.ocean.x576_y361.t12.20080715_12z.nc4:
-    template: ExtData/chemistry/GEIA/v0.0.0/sfc/GEIA.emis_NH3.ocean.x576_y361.t12.20080715_12z.nc4
-  NI2G_GEOS.fp.asm.inst3_3d_aer_Nv.%y4%m2%d2_%h2%n2.V01.nc4:
-    template: /discover/nobackup/projects/gmao/gmao_ops/pub/fp/das/Y%y4/M%m2/D%d2/GEOS.fp.asm.inst3_3d_aer_Nv.%y4%m2%d2_%h2%n2.V01.nc4
-  NI2G_MERRA2_GMI.tavg24_3d_dac_Nv.x576_y361_t12.%y4.nc4:
-    template: ExtData/chemistry/MERRA2GMI/v0.0.0/L72/MERRA2_GMI.tavg24_3d_dac_Nv.x576_y361_t12.%y4.nc4
-  NI2G_NH3-em-anthro_CMIP_CEDS_gn.x2304_y1441_t12.%y4.nc4:
-    template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/NH3-em-anthro_CMIP_CEDS_gn.x2304_y1441_t12.%y4.nc4
-    valid_range: "1979-01-15T12:00/2019-12-15T12:00"
-  NI2G_qfed2.emis_nh3.006.%y4%m2%d2.nc4:
-    template: ExtData/chemistry/QFED/v2.5r1-nrt/sfc/0.1/Y%y4/M%m2/qfed2.emis_nh3.006.%y4%m2%d2.nc4
-    valid_range: "2014-12-01T12:00/2021-11-01T12:00"
-  NI2G_qfed2.emis_nh3.061.%y4%m2%d2.nc4:
-    template: ExtData/chemistry/QFED/v2.5r1-nrt/sfc/0.1/Y%y4/M%m2/qfed2.emis_nh3.061.%y4%m2%d2.nc4
-    valid_range: "2021-11-01T12:00/2025-01-01"
-
-Samplings:
-  NI2G_sample_0:
-    time_interpolation: False
-  NI2G_sample_1:
-    update_frequency: PT24H
-    update_offset: PT12H
-    update_reference_time: '0'
-  NI2G_sample_2:
-    extrapolation: clim
-    update_frequency: PT24H
-    update_offset: PT12H
-    update_reference_time: '0'
-  NI2G_sample_3:
-    extrapolation: persist_closest
-  NI2G_sample_4:
-    update_frequency: PT24H
-    update_offset: PT12H
-    update_reference_time: '0'
-    source_time: "2019-01-15T12:00/2019-12-15T00:00:00"
-
-Exports:
-  EMI_NH3_AG:
-    collection: /dev/null
-    regrid: CONSERVE
-    sample: NI2G_sample_2
-    variable: nh3_emis
-  EMI_NH3_BB:
-    - {starting: "2014-12-01T12:00", collection: NI2G_qfed2.emis_nh3.006.%y4%m2%d2.nc4, linear_transformation: [0.0, 0.778], regrid: CONSERVE, sample: NI2G_sample_1, variable: biomass}
-    - {starting: "2021-11-01T12:00", collection: NI2G_qfed2.emis_nh3.061.%y4%m2%d2.nc4, linear_transformation: [0.0, 0.778], regrid: CONSERVE, sample: NI2G_sample_1, variable: biomass}
-  EMI_NH3_EN:
-    - {starting: "1979-01-15T12:00", collection: NI2G_NH3-em-anthro_CMIP_CEDS_gn.x2304_y1441_t12.%y4.nc4, sample: NI2G_sample_1, regrid: CONSERVE, variable: nh3}
-    - {starting: "2019-12-15T12:00", collection: NI2G_NH3-em-anthro_CMIP_CEDS_gn.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: NI2G_sample_4, variable: nh3}
-  EMI_NH3_IN:
-    collection: /dev/null
-    regrid: CONSERVE
-    sample: NI2G_sample_2
-    variable: nh3_emis
-  EMI_NH3_OC:
-    collection: NI2G_GEIA.emis_NH3.ocean.x576_y361.t12.20080715_12z.nc4
-    regrid: CONSERVE
-    sample: NI2G_sample_2
-    variable: emiss_ocn
-  EMI_NH3_RE:
-    collection: /dev/null
-    regrid: CONSERVE
-    sample: NI2G_sample_2
-    variable: nh3_emis
-  EMI_NH3_TR:
-    collection: /dev/null
-    regrid: CONSERVE
-    sample: NI2G_sample_2
-    variable: nh3_emis
-  NITRATE_HNO3:
-    collection: NI2G_MERRA2_GMI.tavg24_3d_dac_Nv.x576_y361_t12.%y4.nc4
-    linear_transformation:
-      - 0.0
-      - 0.2
-    sample: NI2G_sample_1
-    variable: hno3
-  NI_regionMask:
-    collection: NI2G_ARCTAS.region_mask.x540_y361.2008.nc
-    regrid: VOTE
-    sample: NI2G_sample_3
-    variable: REGION_MASK
-  climNO3an1:
-    collection: NI2G_GEOS.fp.asm.inst3_3d_aer_Nv.%y4%m2%d2_%h2%n2.V01.nc4
-    regrid: CONSERVE
-    sample: NI2G_sample_0
-    variable: NO3AN1
-  climNO3an2:
-    collection: NI2G_GEOS.fp.asm.inst3_3d_aer_Nv.%y4%m2%d2_%h2%n2.V01.nc4
-    regrid: CONSERVE
-    sample: NI2G_sample_0
-    variable: NO3AN2
-  climNO3an3:
-    collection: NI2G_GEOS.fp.asm.inst3_3d_aer_Nv.%y4%m2%d2_%h2%n2.V01.nc4
-    regrid: CONSERVE
-    sample: NI2G_sample_0
-    variable: NO3AN3
-  GMI_HNO3:
-    collection: /dev/null
-    regrid: CONSERVE
-    sample: NI2G_sample_2
-    variable: GMI_HNO3
diff --git a/ESMF/GOCART2G_GridComp/SS2G_GridComp/AMIP/SS2G_GridComp_ExtData.yaml b/ESMF/GOCART2G_GridComp/SS2G_GridComp/AMIP/SS2G_GridComp_ExtData.yaml
deleted file mode 100644
index ffc5b17a..00000000
--- a/ESMF/GOCART2G_GridComp/SS2G_GridComp/AMIP/SS2G_GridComp_ExtData.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-Collections:
-  SS2G_merra2.aer_Nv.2003-2015.2008%m2clm.nc4:
-    template: ExtData/chemistry/MERRA2/v0.0.0/L72/merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-    valid_range: "2008-01-01T12:00:00/2008-12-15T12:00:00"
-
-Samplings:
-  SS2G_sample_0:
-    extrapolation: clim
-
-Exports:
-  climSSDP001:
-    collection: /dev/null
-  climSSDP002:
-    collection: /dev/null
-  climSSDP003:
-    collection: /dev/null
-  climSSDP004:
-    collection: /dev/null
-  climSSDP005:
-    collection: /dev/null
-  climSSSD001:
-    collection: /dev/null
-  climSSSD002:
-    collection: /dev/null
-  climSSSD003:
-    collection: /dev/null
-  climSSSD004:
-    collection: /dev/null
-  climSSSD005:
-    collection: /dev/null
-  climSSSV001:
-    collection: /dev/null
-  climSSSV002:
-    collection: /dev/null
-  climSSSV003:
-    collection: /dev/null
-  climSSSV004:
-    collection: /dev/null
-  climSSSV005:
-    collection: /dev/null
-  climSSWT001:
-    collection: /dev/null
-  climSSWT002:
-    collection: /dev/null
-  climSSWT003:
-    collection: /dev/null
-  climSSWT004:
-    collection: /dev/null
-  climSSWT005:
-    collection: /dev/null
-  climss001:
-    collection: SS2G_merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-    sample: SS2G_sample_0
-    variable: SS001
-  climss002:
-    collection: SS2G_merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-    sample: SS2G_sample_0
-    variable: SS002
-  climss003:
-    collection: SS2G_merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-    sample: SS2G_sample_0
-    variable: SS003
-  climss004:
-    collection: SS2G_merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-    sample: SS2G_sample_0
-    variable: SS004
-  climss005:
-    collection: SS2G_merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-    sample: SS2G_sample_0
-    variable: SS005
-
-
diff --git a/ESMF/GOCART2G_GridComp/SS2G_GridComp/CMakeLists.txt b/ESMF/GOCART2G_GridComp/SS2G_GridComp/CMakeLists.txt
index 306eea65..28868158 100644
--- a/ESMF/GOCART2G_GridComp/SS2G_GridComp/CMakeLists.txt
+++ b/ESMF/GOCART2G_GridComp/SS2G_GridComp/CMakeLists.txt
@@ -8,7 +8,7 @@ mapl_acg (${this}   SS2G_StateSpecs.rc
           IMPORT_SPECS EXPORT_SPECS INTERNAL_SPECS
           GET_POINTERS DECLARE_POINTERS)
 
-file (GLOB_RECURSE rc_files CONFIGURE_DEPENDS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.rc *.yaml)
+file (GLOB_RECURSE rc_files CONFIGURE_DEPENDS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.rc)
 foreach ( file ${rc_files} )
    get_filename_component( dir ${file} DIRECTORY )
    install( FILES ${file} DESTINATION etc/${dir} )
diff --git a/ESMF/GOCART2G_GridComp/SS2G_GridComp/SS2G_GridComp_ExtData.yaml b/ESMF/GOCART2G_GridComp/SS2G_GridComp/SS2G_GridComp_ExtData.yaml
deleted file mode 100644
index ffc5b17a..00000000
--- a/ESMF/GOCART2G_GridComp/SS2G_GridComp/SS2G_GridComp_ExtData.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-Collections:
-  SS2G_merra2.aer_Nv.2003-2015.2008%m2clm.nc4:
-    template: ExtData/chemistry/MERRA2/v0.0.0/L72/merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-    valid_range: "2008-01-01T12:00:00/2008-12-15T12:00:00"
-
-Samplings:
-  SS2G_sample_0:
-    extrapolation: clim
-
-Exports:
-  climSSDP001:
-    collection: /dev/null
-  climSSDP002:
-    collection: /dev/null
-  climSSDP003:
-    collection: /dev/null
-  climSSDP004:
-    collection: /dev/null
-  climSSDP005:
-    collection: /dev/null
-  climSSSD001:
-    collection: /dev/null
-  climSSSD002:
-    collection: /dev/null
-  climSSSD003:
-    collection: /dev/null
-  climSSSD004:
-    collection: /dev/null
-  climSSSD005:
-    collection: /dev/null
-  climSSSV001:
-    collection: /dev/null
-  climSSSV002:
-    collection: /dev/null
-  climSSSV003:
-    collection: /dev/null
-  climSSSV004:
-    collection: /dev/null
-  climSSSV005:
-    collection: /dev/null
-  climSSWT001:
-    collection: /dev/null
-  climSSWT002:
-    collection: /dev/null
-  climSSWT003:
-    collection: /dev/null
-  climSSWT004:
-    collection: /dev/null
-  climSSWT005:
-    collection: /dev/null
-  climss001:
-    collection: SS2G_merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-    sample: SS2G_sample_0
-    variable: SS001
-  climss002:
-    collection: SS2G_merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-    sample: SS2G_sample_0
-    variable: SS002
-  climss003:
-    collection: SS2G_merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-    sample: SS2G_sample_0
-    variable: SS003
-  climss004:
-    collection: SS2G_merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-    sample: SS2G_sample_0
-    variable: SS004
-  climss005:
-    collection: SS2G_merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-    sample: SS2G_sample_0
-    variable: SS005
-
-
diff --git a/ESMF/GOCART2G_GridComp/SU2G_GridComp/AMIP/SU2G_GridComp_ExtData.yaml b/ESMF/GOCART2G_GridComp/SU2G_GridComp/AMIP/SU2G_GridComp_ExtData.yaml
deleted file mode 100644
index a57fe5cb..00000000
--- a/ESMF/GOCART2G_GridComp/SU2G_GridComp/AMIP/SU2G_GridComp_ExtData.yaml
+++ /dev/null
@@ -1,160 +0,0 @@
-Collections:
-  SU2G_DMSclim_sfcconcentration.x360_y181_t12.Lana2011.nc4:
-    template: ExtData/chemistry/Lana/v2011/DMSclim_sfcconcentration.x360_y181_t12.Lana2011.nc4
-  SU2G_MERRA2_GMI.tavg24_3d_dac_Nv.x576_y361_t12.%y4.nc4:
-    template: ExtData/chemistry/MERRA2GMI/v0.0.0/L72/MERRA2_GMI.tavg24_3d_dac_Nv.x576_y361_t12.%y4.nc4
-  SU2G_SO2-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4:
-    template: ExtData/chemistry/CEDS/v2021-04-21-revised/L72/SO2-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4
-    valid_range: "1979-01-15T12:00/2019-12-15T12:00"
-  SU2G_SO2-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4:
-    template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/SO2-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4
-    valid_range: "1979-01-15T12:00/2019-12-15T12:00"
-  SU2G_SO2-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4:
-    template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/SO2-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4
-    valid_range: "1979-01-15T12:00/2019-12-15T12:00"
-  SU2G_SO2-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4:
-    template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/SO2-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4
-    valid_range: "1979-01-15T12:00/2019-12-15T12:00"
-  SU2G_SO4-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4:
-    template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/SO4-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4
-    valid_range: "1979-01-15T12:00/2019-12-15T12:00"
-  SU2G_merra2.aer_Nv.2003-2015.2008%m2clm.nc4:
-    template: ExtData/chemistry/MERRA2/v0.0.0/L72/merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-    valid_range: "2008-01-01T12:00:00/2008-12-15T12:00:00"
-  SU2G_qfed2.emis_so2.061.%y4%m2%d2.nc4:
-    template: ExtData/chemistry/QFED/v2.6r1/sfc/0.1/Y%y4/M%m2/qfed2.emis_so2.061.%y4%m2%d2.nc4
-    valid_range: "2000-02-29T12:00/2025-01-01"
-  SU2G_hfed.emis_so2.x576_y361.%y4%m2.nc4:
-    template: ExtData/chemistry/HFED/v1.0/Y%y4/M%m2/hfed.emis_so2.x576_y361.%y4%m2.nc4
-    valid_range: "1960-01-16T12:00/2000-012-16T12:00"
-
-Samplings:
-  SU2G_sample_0:
-    extrapolation: clim
-  SU2G_sample_1:
-    update_frequency: PT24H
-    update_offset: PT12H
-    update_reference_time: '0'
-  SU2G_sample_2:
-    extrapolation: clim
-    update_frequency: PT24H
-    update_offset: PT12H
-    update_reference_time: '0'
-  SU2G_sample_3:
-    extrapolation: clim
-    update_frequency: PT24H
-    update_offset: PT12H
-    update_reference_time: '0'
-    source_time: "2019-01-15T12:00/2019-12-15T00:00:00"
-
-Exports:
-  SU_AIRCRAFT:
-    - {starting: "1979-01-15T12:00", collection: SU2G_SO2-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4, sample: SU2G_sample_1, regrid: CONSERVE, variable: so2_aviation}
-    - {starting: "2019-12-15T12:00", collection: SU2G_SO2-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4, regrid: CONSERVE, sample: SU2G_sample_3, variable: so2_aviation}
-  SU_ANTHROL1:
-    - {starting: "1979-01-15T12:00", collection: SU2G_SO2-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4, sample: SU2G_sample_1, regrid: CONSERVE, variable: so2_nonenergy}
-    - {starting: "2019-12-15T12:00", collection: SU2G_SO2-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: SU2G_sample_3, variable: so2_nonenergy}
-  SU_ANTHROL2:
-    - {starting: "1979-01-15T12:00", collection: SU2G_SO2-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4, sample: SU2G_sample_1, regrid: CONSERVE, variable: so2_energy}
-    - {starting: "2019-12-15T12:00", collection: SU2G_SO2-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: SU2G_sample_3, variable: so2_energy}
-  SU_AVIATION_CDS:
-    collection: /dev/null
-    regrid: CONSERVE
-    sample: SU2G_sample_2
-    variable: so2_aviation
-  SU_AVIATION_CRS:
-    collection: /dev/null
-    regrid: CONSERVE
-    sample: SU2G_sample_2
-    variable: so2_aviation
-  SU_AVIATION_LTO:
-    collection: /dev/null
-    regrid: CONSERVE
-    sample: SU2G_sample_2
-    variable: so2_aviation
-  SU_BIOMASS:
-    - {starting: "1960-01-16T12:00", collection: SU2G_hfed.emis_so2.x576_y361.%y4%m2.nc4, linear_transformation: [0.0, 0.778], regrid: CONSERVE, sample: SU2G_sample_1, variable: biomass}
-    - {starting: "2000-03-01T00:00", collection: SU2G_qfed2.emis_so2.061.%y4%m2%d2.nc4, linear_transformation: [0.0, 0.778], regrid: CONSERVE, sample: SU2G_sample_1, variable: biomass}
-  SU_DMSO:
-    collection: SU2G_DMSclim_sfcconcentration.x360_y181_t12.Lana2011.nc4
-    regrid: CONSERVE
-    sample: SU2G_sample_2
-    variable: conc
-  SU_H2O2:
-    collection: SU2G_MERRA2_GMI.tavg24_3d_dac_Nv.x576_y361_t12.%y4.nc4
-    regrid: CONSERVE
-    sample: SU2G_sample_1
-    variable: h2o2
-  SU_NO3:
-    collection: SU2G_MERRA2_GMI.tavg24_3d_dac_Nv.x576_y361_t12.%y4.nc4
-    regrid: CONSERVE
-    sample: SU2G_sample_1
-    variable: no3
-  SU_OH:
-    collection: SU2G_MERRA2_GMI.tavg24_3d_dac_Nv.x576_y361_t12.%y4.nc4
-    regrid: CONSERVE
-    sample: SU2G_sample_1
-    variable: oh
-  SU_SHIPSO2:
-    - {starting: "1979-01-15T12:00", collection: SU2G_SO2-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4, sample: SU2G_sample_1, regrid: CONSERVE, variable: so2_shipping}
-    - {starting: "2019-12-15T12:00", collection: SU2G_SO2-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: SU2G_sample_3, variable: so2_shipping}
-  SU_SHIPSO4:
-    - {starting: "1979-01-15T12:00", collection: SU2G_SO4-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4, sample: SU2G_sample_1, regrid: CONSERVE, variable: so4_shipping}
-    - {starting: "2019-12-15T12:00", collection: SU2G_SO4-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: SU2G_sample_3, variable: so4_shipping}
-  climSO4:
-    collection: SU2G_merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-    sample: SU2G_sample_0
-    variable: SO4
-  climSUDP001:
-    collection: /dev/null
-  climSUDP002:
-    collection: /dev/null
-  climSUDP003:
-    collection: /dev/null
-  climSUDP004:
-    collection: /dev/null
-  climSUSD001:
-    collection: /dev/null
-  climSUSD002:
-    collection: /dev/null
-  climSUSD003:
-    collection: /dev/null
-  climSUSD004:
-    collection: /dev/null
-  climSUSV001:
-    collection: /dev/null
-  climSUSV002:
-    collection: /dev/null
-  climSUSV003:
-    collection: /dev/null
-  climSUSV004:
-    collection: /dev/null
-  climSUWT001:
-    collection: /dev/null
-  climSUWT002:
-    collection: /dev/null
-  climSUWT003:
-    collection: /dev/null
-  climSUWT004:
-    collection: /dev/null
-  pSO2_OCS:
-    collection: /dev/null
-    regrid: CONSERVE
-    sample: SU2G_sample_2
-    variable: biofuel
-  GMI_H2O2:
-    collection: /dev/null
-    regrid: CONSERVE
-    sample: SU2G_sample_2
-    variable: GMI_H2O2
-  GMI_OH:
-    collection: /dev/null
-    regrid: CONSERVE
-    sample: SU2G_sample_2
-    variable: GMI_OH
-  GMI_NO3:
-    collection: /dev/null
-    regrid: CONSERVE
-    sample: SU2G_sample_2
-    variable: GMI_NO3
-
diff --git a/ESMF/GOCART2G_GridComp/SU2G_GridComp/CMakeLists.txt b/ESMF/GOCART2G_GridComp/SU2G_GridComp/CMakeLists.txt
index 323b2392..a5a720b6 100644
--- a/ESMF/GOCART2G_GridComp/SU2G_GridComp/CMakeLists.txt
+++ b/ESMF/GOCART2G_GridComp/SU2G_GridComp/CMakeLists.txt
@@ -8,7 +8,7 @@ mapl_acg (${this}   SU2G_StateSpecs.rc
           IMPORT_SPECS EXPORT_SPECS INTERNAL_SPECS
           GET_POINTERS DECLARE_POINTERS)
 
-file (GLOB_RECURSE rc_files CONFIGURE_DEPENDS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.rc *.yaml)
+file (GLOB_RECURSE rc_files CONFIGURE_DEPENDS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.rc)
 foreach ( file ${rc_files} )
    get_filename_component( dir ${file} DIRECTORY )
    install( FILES ${file} DESTINATION etc/${dir} )
diff --git a/ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_GridComp_ExtData.yaml b/ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_GridComp_ExtData.yaml
deleted file mode 100644
index 665eeae5..00000000
--- a/ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_GridComp_ExtData.yaml
+++ /dev/null
@@ -1,193 +0,0 @@
-Collections:
-  SU2G_DMSclim_sfcconcentration.x360_y181_t12.Lana2011.nc4:
-    template: ExtData/chemistry/Lana/v2011/DMSclim_sfcconcentration.x360_y181_t12.Lana2011.nc4
-  SU2G_MERRA2_GMI.tavg24_3d_dac_Nv.x576_y361_t12.%y4.nc4:
-    template: ExtData/chemistry/MERRA2GMI/v0.0.0/L72/MERRA2_GMI.tavg24_3d_dac_Nv.x576_y361_t12.%y4.nc4
-  SU2G_SO2-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4:
-    template: ExtData/chemistry/CEDS/v2021-04-21-revised/L72/SO2-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4
-    valid_range: "1979-01-15T12:00/2019-12-15T12:00"
-  SU2G_SO2-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4:
-    template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/SO2-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4
-    valid_range: "1979-01-15T12:00/2019-12-15T12:00"
-  SU2G_SO2-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4:
-    template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/SO2-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4
-    valid_range: "1979-01-15T12:00/2019-12-15T12:00"
-  SU2G_SO2-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4:
-    template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/SO2-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4
-    valid_range: "1979-01-15T12:00/2019-12-15T12:00"
-  SU2G_SO4-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4:
-    template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/SO4-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4
-    valid_range: "1979-01-15T12:00/2019-12-15T12:00"
-  SU2G_merra2.aer_Nv.2003-2015.2008%m2clm.nc4:
-    template: ExtData/chemistry/MERRA2/v0.0.0/L72/merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-  SU2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4:
-    template: ExtData/chemistry/MERRA2/v0.0.0/sfc/merra2.aer_Nx.2003-2015.2008%m2clm.nc4
-  SU2G_qfed2.emis_so2.006.%y4%m2%d2.nc4:
-    template: ExtData/chemistry/QFED/v2.5r1-nrt/sfc/0.1/Y%y4/M%m2/qfed2.emis_so2.006.%y4%m2%d2.nc4
-    valid_range: "2014-12-01T12:00/2021-11-01T12:00"
-  SU2G_qfed2.emis_so2.061.%y4%m2%d2.nc4:
-    template: ExtData/chemistry/QFED/v2.5r1-nrt/sfc/0.1/Y%y4/M%m2/qfed2.emis_so2.061.%y4%m2%d2.nc4
-    valid_range: "2021-11-01T12:00/2025-01-01"
-
-Samplings:
-  SU2G_sample_0:
-    extrapolation: clim
-  SU2G_sample_1:
-    update_frequency: PT24H
-    update_offset: PT12H
-    update_reference_time: '0'
-  SU2G_sample_2:
-    extrapolation: clim
-    update_frequency: PT24H
-    update_offset: PT12H
-    update_reference_time: '0'
-  SU2G_sample_3:
-    extrapolation: clim
-    update_frequency: PT24H
-    update_offset: PT12H
-    update_reference_time: '0'
-    source_time: "2019-01-15T12:00/2019-12-15T00:00:00"
-
-Exports:
-  SU_AIRCRAFT:
-    - {starting: "1979-01-15T12:00", collection: SU2G_SO2-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4, sample: SU2G_sample_1, regrid: CONSERVE, variable: so2_aviation}
-    - {starting: "2019-12-15T12:00", collection: SU2G_SO2-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4, regrid: CONSERVE, sample: SU2G_sample_3, variable: so2_aviation}
-  SU_ANTHROL1:
-    - {starting: "1979-01-15T12:00", collection: SU2G_SO2-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4, sample: SU2G_sample_1, regrid: CONSERVE, variable: so2_nonenergy}
-    - {starting: "2019-12-15T12:00", collection: SU2G_SO2-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: SU2G_sample_3, variable: so2_nonenergy}
-  SU_ANTHROL2:
-    - {starting: "1979-01-15T12:00", collection: SU2G_SO2-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4, sample: SU2G_sample_1, regrid: CONSERVE, variable: so2_energy}
-    - {starting: "2019-12-15T12:00", collection: SU2G_SO2-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: SU2G_sample_3, variable: so2_energy}
-  SU_AVIATION_CDS:
-    collection: /dev/null
-    regrid: CONSERVE
-    sample: SU2G_sample_2
-    variable: so2_aviation
-  SU_AVIATION_CRS:
-    collection: /dev/null
-    regrid: CONSERVE
-    sample: SU2G_sample_2
-    variable: so2_aviation
-  SU_AVIATION_LTO:
-    collection: /dev/null
-    regrid: CONSERVE
-    sample: SU2G_sample_2
-    variable: so2_aviation
-  SU_BIOMASS:
-    - {starting: "2014-12-01T12:00", collection: SU2G_qfed2.emis_so2.006.%y4%m2%d2.nc4, linear_transformation: [0.0, 0.778], regrid: CONSERVE, sample: SU2G_sample_1, variable: biomass}
-    - {starting: "2021-11-01T12:00", collection: SU2G_qfed2.emis_so2.061.%y4%m2%d2.nc4, linear_transformation: [0.0, 0.778], regrid: CONSERVE, sample: SU2G_sample_1, variable: biomass}
-  SU_DMSO:
-    collection: SU2G_DMSclim_sfcconcentration.x360_y181_t12.Lana2011.nc4
-    regrid: CONSERVE
-    sample: SU2G_sample_2
-    variable: conc
-  SU_H2O2:
-    collection: SU2G_MERRA2_GMI.tavg24_3d_dac_Nv.x576_y361_t12.%y4.nc4
-    regrid: CONSERVE
-    sample: SU2G_sample_1
-    variable: h2o2
-  SU_NO3:
-    collection: SU2G_MERRA2_GMI.tavg24_3d_dac_Nv.x576_y361_t12.%y4.nc4
-    regrid: CONSERVE
-    sample: SU2G_sample_1
-    variable: no3
-  SU_OH:
-    collection: SU2G_MERRA2_GMI.tavg24_3d_dac_Nv.x576_y361_t12.%y4.nc4
-    regrid: CONSERVE
-    sample: SU2G_sample_1
-    variable: oh
-  SU_SHIPSO2:
-    - {starting: "1979-01-15T12:00", collection: SU2G_SO2-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4, sample: SU2G_sample_1, regrid: CONSERVE, variable: so2_shipping}
-    - {starting: "2019-12-15T12:00", collection: SU2G_SO2-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: SU2G_sample_3, variable: so2_shipping}
-  SU_SHIPSO4:
-    - {starting: "1979-01-15T12:00", collection: SU2G_SO4-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4, sample: SU2G_sample_1, regrid: CONSERVE, variable: so4_shipping}
-    - {starting: "2019-12-15T12:00", collection: SU2G_SO4-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: SU2G_sample_3, variable: so4_shipping}
-  climSO4:
-    collection: SU2G_merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-    sample: SU2G_sample_0
-    variable: SO4
-  climSUDP001:
-    collection: SU2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4
-    sample: SU2G_sample_0
-    variable: SUDP001
-  climSUDP002:
-    collection: SU2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4
-    sample: SU2G_sample_0
-    variable: SUDP002
-  climSUDP003:
-    collection: SU2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4
-    sample: SU2G_sample_0
-    variable: SUDP003
-  climSUDP004:
-    collection: SU2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4
-    sample: SU2G_sample_0
-    variable: SUDP004
-  climSUSD001:
-    collection: /dev/null
-    sample: SU2G_sample_0
-    variable: SUSD001
-  climSUSD002:
-    collection: /dev/null
-    sample: SU2G_sample_0
-    variable: SUSD002
-  climSUSD003:
-    collection: /dev/null
-    sample: SU2G_sample_0
-    variable: SUSD003
-  climSUSD004:
-    collection: /dev/null
-    sample: SU2G_sample_0
-    variable: SUSD004
-  climSUSV001:
-    collection: SU2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4
-    sample: SU2G_sample_0
-    variable: SUSV001
-  climSUSV002:
-    collection: SU2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4
-    sample: SU2G_sample_0
-    variable: SUSV002
-  climSUSV003:
-    collection: SU2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4
-    sample: SU2G_sample_0
-    variable: SUSV003
-  climSUSV004:
-    collection: SU2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4
-    sample: SU2G_sample_0
-    variable: SUSV004
-  climSUWT001:
-    collection: SU2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4
-    sample: SU2G_sample_0
-    variable: SUWT001
-  climSUWT002:
-    collection: SU2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4
-    sample: SU2G_sample_0
-    variable: SUWT002
-  climSUWT003:
-    collection: SU2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4
-    sample: SU2G_sample_0
-    variable: SUWT003
-  climSUWT004:
-    collection: SU2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4
-    sample: SU2G_sample_0
-    variable: SUWT004
-  pSO2_OCS:
-    collection: /dev/null
-    regrid: CONSERVE
-    sample: SU2G_sample_2
-    variable: biofuel
-  GMI_H2O2:
-    collection: /dev/null
-    regrid: CONSERVE
-    sample: SU2G_sample_2
-    variable: GMI_H2O2
-  GMI_OH:
-    collection: /dev/null
-    regrid: CONSERVE
-    sample: SU2G_sample_2
-    variable: GMI_OH
-  GMI_NO3:
-    collection: /dev/null
-    regrid: CONSERVE
-    sample: SU2G_sample_2
-    variable: GMI_NO3
-