diff --git a/ccpp/suites/suite_FV3_CPT_v0.xml b/ccpp/suites/suite_FV3_CPT_v0.xml
deleted file mode 100644
index 10921d8e7..000000000
--- a/ccpp/suites/suite_FV3_CPT_v0.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="FV3_CPT_v0" version="1">
-  <!-- <init></init> -->
-  <group name="fast_physics">
-    <subcycle loop="1">
-      <scheme>fv_sat_adj</scheme>
-    </subcycle>
-  </group>
-  <group name="time_vary">
-    <subcycle loop="1">
-      <scheme>GFS_time_vary_pre</scheme>
-      <scheme>GFS_rrtmg_setup</scheme>
-      <scheme>GFS_rad_time_vary</scheme>
-      <scheme>GFS_phys_time_vary</scheme>
-    </subcycle>
-  </group>
-  <group name="radiation">
-    <subcycle loop="1">
-      <scheme>GFS_suite_interstitial_rad_reset</scheme>
-      <scheme>GFS_rrtmg_pre</scheme>
-      <scheme>GFS_radiation_surface</scheme>
-      <scheme>rrtmg_sw_pre</scheme>
-      <scheme>rrtmg_sw</scheme>
-      <scheme>rrtmg_sw_post</scheme>
-      <scheme>rrtmg_lw_pre</scheme>
-      <scheme>rrtmg_lw</scheme>
-      <scheme>rrtmg_lw_post</scheme>
-      <scheme>GFS_rrtmg_post</scheme>
-    </subcycle>
-  </group>
-  <group name="physics">
-    <subcycle loop="1">
-      <scheme>GFS_suite_interstitial_phys_reset</scheme>
-      <scheme>GFS_suite_stateout_reset</scheme>
-      <scheme>get_prs_fv3</scheme>
-      <scheme>GFS_suite_interstitial_1</scheme>
-      <scheme>GFS_surface_generic_pre</scheme>
-      <scheme>GFS_surface_composites_pre</scheme>
-      <scheme>dcyc2t3</scheme>
-      <scheme>GFS_surface_composites_inter</scheme>
-      <scheme>GFS_suite_interstitial_2</scheme>
-    </subcycle>
-    <!-- Surface iteration loop -->
-    <subcycle loop="2">
-      <scheme>sfc_diff</scheme>
-      <scheme>GFS_surface_loop_control_part1</scheme>
-      <scheme>sfc_nst_pre</scheme>
-      <scheme>sfc_nst</scheme>
-      <scheme>sfc_nst_post</scheme>
-      <scheme>lsm_noah</scheme>
-      <scheme>sfc_sice</scheme>
-      <scheme>GFS_surface_loop_control_part2</scheme>
-    </subcycle>
-    <!-- End of surface iteration loop -->
-    <subcycle loop="1">
-      <scheme>GFS_surface_composites_post</scheme>
-      <scheme>sfc_diag</scheme>
-      <scheme>sfc_diag_post</scheme>
-      <scheme>GFS_surface_generic_post</scheme>
-      <scheme>GFS_PBL_generic_pre</scheme>
-      <scheme>hedmf</scheme>
-      <scheme>GFS_PBL_generic_post</scheme>
-      <scheme>GFS_GWD_generic_pre</scheme>
-      <scheme>cires_ugwp</scheme>
-      <scheme>cires_ugwp_post</scheme>
-      <scheme>GFS_GWD_generic_post</scheme>
-      <scheme>rayleigh_damp</scheme>
-      <scheme>GFS_suite_stateout_update</scheme>
-      <scheme>ozphys_2015</scheme>
-      <scheme>h2ophys</scheme>
-      <scheme>get_phi_fv3</scheme>
-      <scheme>GFS_suite_interstitial_3</scheme>
-      <scheme>GFS_DCNV_generic_pre</scheme>
-      <scheme>cs_conv_pre</scheme>
-      <scheme>cs_conv</scheme>
-      <scheme>cs_conv_post</scheme>
-      <scheme>GFS_DCNV_generic_post</scheme>
-      <scheme>GFS_SCNV_generic_pre</scheme>
-      <scheme>samfshalcnv</scheme>
-      <scheme>GFS_SCNV_generic_post</scheme>
-      <scheme>GFS_suite_interstitial_4</scheme>
-      <scheme>cnvc90</scheme>
-      <scheme>GFS_MP_generic_pre</scheme>
-      <scheme>m_micro_pre</scheme>
-      <scheme>m_micro</scheme>
-      <scheme>m_micro_post</scheme>
-      <scheme>cs_conv_aw_adj</scheme>
-      <scheme>GFS_MP_generic_post</scheme>
-      <scheme>maximum_hourly_diagnostics</scheme>
-      <scheme>phys_tend</scheme>
-    </subcycle>
-  </group>
-  <group name="stochastics">
-    <subcycle loop="1">
-      <scheme>GFS_stochastics</scheme>
-    </subcycle>
-  </group>
-  <!-- <finalize></finalize> -->
-</suite>
diff --git a/ccpp/suites/suite_FV3_GFS_2017.xml b/ccpp/suites/suite_FV3_GFS_2017.xml
deleted file mode 100644
index 579f4ce88..000000000
--- a/ccpp/suites/suite_FV3_GFS_2017.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="FV3_GFS_2017" version="1">
-  <!-- <init></init> -->
-  <group name="time_vary">
-    <subcycle loop="1">
-      <scheme>GFS_time_vary_pre</scheme>
-      <scheme>GFS_rrtmg_setup</scheme>
-      <scheme>GFS_rad_time_vary</scheme>
-      <scheme>GFS_phys_time_vary</scheme>
-    </subcycle>
-  </group>
-  <group name="radiation">
-    <subcycle loop="1">
-      <scheme>GFS_suite_interstitial_rad_reset</scheme>
-      <scheme>GFS_rrtmg_pre</scheme>
-      <scheme>GFS_radiation_surface</scheme>
-      <scheme>rrtmg_sw_pre</scheme>
-      <scheme>rrtmg_sw</scheme>
-      <scheme>rrtmg_sw_post</scheme>
-      <scheme>rrtmg_lw_pre</scheme>
-      <scheme>rrtmg_lw</scheme>
-      <scheme>rrtmg_lw_post</scheme>
-      <scheme>GFS_rrtmg_post</scheme>
-    </subcycle>
-  </group>
-  <group name="physics">
-    <subcycle loop="1">
-      <scheme>GFS_suite_interstitial_phys_reset</scheme>
-      <scheme>GFS_suite_stateout_reset</scheme>
-      <scheme>get_prs_fv3</scheme>
-      <scheme>GFS_suite_interstitial_1</scheme>
-      <scheme>GFS_surface_generic_pre</scheme>
-      <scheme>GFS_surface_composites_pre</scheme>
-      <scheme>dcyc2t3</scheme>
-      <scheme>GFS_surface_composites_inter</scheme>
-      <scheme>GFS_suite_interstitial_2</scheme>
-    </subcycle>
-    <!-- Surface iteration loop -->
-    <subcycle loop="2">
-      <scheme>sfc_diff</scheme>
-      <scheme>GFS_surface_loop_control_part1</scheme>
-      <scheme>sfc_nst_pre</scheme>
-      <scheme>sfc_nst</scheme>
-      <scheme>sfc_nst_post</scheme>
-      <scheme>lsm_noah</scheme>
-      <scheme>sfc_sice</scheme>
-      <scheme>GFS_surface_loop_control_part2</scheme>
-    </subcycle>
-    <!-- End of surface iteration loop -->
-    <subcycle loop="1">
-      <scheme>GFS_surface_composites_post</scheme>
-      <scheme>sfc_diag</scheme>
-      <scheme>sfc_diag_post</scheme>
-      <scheme>GFS_surface_generic_post</scheme>
-      <scheme>GFS_PBL_generic_pre</scheme>
-      <scheme>hedmf</scheme>
-      <scheme>GFS_PBL_generic_post</scheme>
-      <scheme>GFS_GWD_generic_pre</scheme>
-      <scheme>cires_ugwp</scheme>
-      <scheme>cires_ugwp_post</scheme>
-      <scheme>GFS_GWD_generic_post</scheme>
-      <scheme>rayleigh_damp</scheme>
-      <scheme>GFS_suite_stateout_update</scheme>
-      <scheme>ozphys</scheme>
-      <scheme>get_phi_fv3</scheme>
-      <scheme>GFS_suite_interstitial_3</scheme>
-      <scheme>GFS_DCNV_generic_pre</scheme>
-      <scheme>samfdeepcnv</scheme>
-      <scheme>GFS_DCNV_generic_post</scheme>
-      <scheme>GFS_SCNV_generic_pre</scheme>
-      <scheme>samfshalcnv</scheme>
-      <scheme>GFS_SCNV_generic_post</scheme>
-      <scheme>GFS_suite_interstitial_4</scheme>
-      <scheme>cnvc90</scheme>
-      <scheme>GFS_MP_generic_pre</scheme>
-      <scheme>zhaocarr_gscond</scheme>
-      <scheme>zhaocarr_precpd</scheme>
-      <scheme>GFS_MP_generic_post</scheme>
-      <scheme>maximum_hourly_diagnostics</scheme>
-      <scheme>phys_tend</scheme>
-    </subcycle>
-  </group>
-  <group name="stochastics">
-    <subcycle loop="1">
-      <scheme>GFS_stochastics</scheme>
-    </subcycle>
-  </group>
-  <!-- <finalize></finalize> -->
-</suite>
diff --git a/ccpp/suites/suite_FV3_GFS_2017_coupled.xml b/ccpp/suites/suite_FV3_GFS_2017_coupled.xml
deleted file mode 100644
index 32af44444..000000000
--- a/ccpp/suites/suite_FV3_GFS_2017_coupled.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="FV3_GFS_2017_coupled" version="1">
-  <!-- <init></init> -->
-  <group name="time_vary">
-    <subcycle loop="1">
-      <scheme>GFS_time_vary_pre</scheme>
-      <scheme>GFS_rrtmg_setup</scheme>
-      <scheme>GFS_rad_time_vary</scheme>
-      <scheme>GFS_phys_time_vary</scheme>
-    </subcycle>
-  </group>
-  <group name="radiation">
-    <subcycle loop="1">
-      <scheme>GFS_suite_interstitial_rad_reset</scheme>
-      <scheme>GFS_rrtmg_pre</scheme>
-      <scheme>GFS_radiation_surface</scheme>
-      <scheme>rrtmg_sw_pre</scheme>
-      <scheme>rrtmg_sw</scheme>
-      <scheme>rrtmg_sw_post</scheme>
-      <scheme>rrtmg_lw_pre</scheme>
-      <scheme>rrtmg_lw</scheme>
-      <scheme>rrtmg_lw_post</scheme>
-      <scheme>GFS_rrtmg_post</scheme>
-    </subcycle>
-  </group>
-  <group name="physics">
-    <subcycle loop="1">
-      <scheme>GFS_suite_interstitial_phys_reset</scheme>
-      <scheme>GFS_suite_stateout_reset</scheme>
-      <scheme>get_prs_fv3</scheme>
-      <scheme>GFS_suite_interstitial_1</scheme>
-      <scheme>GFS_surface_generic_pre</scheme>
-      <scheme>GFS_surface_composites_pre</scheme>
-      <scheme>dcyc2t3</scheme>
-      <scheme>GFS_surface_composites_inter</scheme>
-      <scheme>GFS_suite_interstitial_2</scheme>
-    </subcycle>
-    <!-- Surface iteration loop -->
-    <subcycle loop="2">
-      <scheme>sfc_diff</scheme>
-      <scheme>GFS_surface_loop_control_part1</scheme>
-      <scheme>sfc_ocean</scheme>
-      <scheme>lsm_noah</scheme>
-      <scheme>sfc_cice</scheme>
-      <scheme>sfc_sice</scheme>
-      <scheme>GFS_surface_loop_control_part2</scheme>
-    </subcycle>
-    <!-- End of surface iteration loop -->
-    <subcycle loop="1">
-      <scheme>GFS_surface_composites_post</scheme>
-      <scheme>sfc_diag</scheme>
-      <scheme>sfc_diag_post</scheme>
-      <scheme>GFS_surface_generic_post</scheme>
-      <scheme>GFS_PBL_generic_pre</scheme>
-      <scheme>hedmf</scheme>
-      <scheme>GFS_PBL_generic_post</scheme>
-      <scheme>GFS_GWD_generic_pre</scheme>
-      <scheme>cires_ugwp</scheme>
-      <scheme>cires_ugwp_post</scheme>
-      <scheme>GFS_GWD_generic_post</scheme>
-      <scheme>rayleigh_damp</scheme>
-      <scheme>GFS_suite_stateout_update</scheme>
-      <scheme>ozphys</scheme>
-      <scheme>get_phi_fv3</scheme>
-      <scheme>GFS_suite_interstitial_3</scheme>
-      <scheme>GFS_DCNV_generic_pre</scheme>
-      <scheme>samfdeepcnv</scheme>
-      <scheme>GFS_DCNV_generic_post</scheme>
-      <scheme>GFS_SCNV_generic_pre</scheme>
-      <scheme>samfshalcnv</scheme>
-      <scheme>GFS_SCNV_generic_post</scheme>
-      <scheme>GFS_suite_interstitial_4</scheme>
-      <scheme>cnvc90</scheme>
-      <scheme>GFS_MP_generic_pre</scheme>
-      <scheme>zhaocarr_gscond</scheme>
-      <scheme>zhaocarr_precpd</scheme>
-      <scheme>GFS_MP_generic_post</scheme>
-      <scheme>maximum_hourly_diagnostics</scheme>
-      <scheme>phys_tend</scheme>
-    </subcycle>
-  </group>
-  <group name="stochastics">
-    <subcycle loop="1">
-      <scheme>GFS_stochastics</scheme>
-    </subcycle>
-  </group>
-  <!-- <finalize></finalize> -->
-</suite>
diff --git a/ccpp/suites/suite_FV3_GFS_2017_couplednsst.xml b/ccpp/suites/suite_FV3_GFS_2017_couplednsst.xml
deleted file mode 100644
index 1ae57a5fa..000000000
--- a/ccpp/suites/suite_FV3_GFS_2017_couplednsst.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="FV3_GFS_2017_couplednsst" version="1">
-  <!-- <init></init> -->
-  <group name="time_vary">
-    <subcycle loop="1">
-      <scheme>GFS_time_vary_pre</scheme>
-      <scheme>GFS_rrtmg_setup</scheme>
-      <scheme>GFS_rad_time_vary</scheme>
-      <scheme>GFS_phys_time_vary</scheme>
-    </subcycle>
-  </group>
-  <group name="radiation">
-    <subcycle loop="1">
-      <scheme>GFS_suite_interstitial_rad_reset</scheme>
-      <scheme>GFS_rrtmg_pre</scheme>
-      <scheme>GFS_radiation_surface</scheme>
-      <scheme>rrtmg_sw_pre</scheme>
-      <scheme>rrtmg_sw</scheme>
-      <scheme>rrtmg_sw_post</scheme>
-      <scheme>rrtmg_lw_pre</scheme>
-      <scheme>rrtmg_lw</scheme>
-      <scheme>rrtmg_lw_post</scheme>
-      <scheme>GFS_rrtmg_post</scheme>
-    </subcycle>
-  </group>
-  <group name="physics">
-    <subcycle loop="1">
-      <scheme>GFS_suite_interstitial_phys_reset</scheme>
-      <scheme>GFS_suite_stateout_reset</scheme>
-      <scheme>get_prs_fv3</scheme>
-      <scheme>GFS_suite_interstitial_1</scheme>
-      <scheme>GFS_surface_generic_pre</scheme>
-      <scheme>GFS_surface_composites_pre</scheme>
-      <scheme>dcyc2t3</scheme>
-      <scheme>GFS_surface_composites_inter</scheme>
-      <scheme>GFS_suite_interstitial_2</scheme>
-    </subcycle>
-    <!-- Surface iteration loop -->
-    <subcycle loop="2">
-      <scheme>sfc_diff</scheme>
-      <scheme>GFS_surface_loop_control_part1</scheme>
-      <scheme>lsm_noah</scheme>
-      <scheme>sfc_nst_pre</scheme>
-      <scheme>sfc_nst</scheme>
-      <scheme>sfc_nst_post</scheme>
-      <scheme>sfc_cice</scheme>
-      <scheme>sfc_sice</scheme>
-      <scheme>GFS_surface_loop_control_part2</scheme>
-    </subcycle>
-    <!-- End of surface iteration loop -->
-    <subcycle loop="1">
-      <scheme>GFS_surface_composites_post</scheme>
-      <scheme>sfc_diag</scheme>
-      <scheme>sfc_diag_post</scheme>
-      <scheme>GFS_surface_generic_post</scheme>
-      <scheme>GFS_PBL_generic_pre</scheme>
-      <scheme>hedmf</scheme>
-      <scheme>GFS_PBL_generic_post</scheme>
-      <scheme>GFS_GWD_generic_pre</scheme>
-      <scheme>cires_ugwp</scheme>
-      <scheme>cires_ugwp_post</scheme>
-      <scheme>GFS_GWD_generic_post</scheme>
-      <scheme>rayleigh_damp</scheme>
-      <scheme>GFS_suite_stateout_update</scheme>
-      <scheme>ozphys</scheme>
-      <scheme>get_phi_fv3</scheme>
-      <scheme>GFS_suite_interstitial_3</scheme>
-      <scheme>GFS_DCNV_generic_pre</scheme>
-      <scheme>samfdeepcnv</scheme>
-      <scheme>GFS_DCNV_generic_post</scheme>
-      <scheme>GFS_SCNV_generic_pre</scheme>
-      <scheme>samfshalcnv</scheme>
-      <scheme>GFS_SCNV_generic_post</scheme>
-      <scheme>GFS_suite_interstitial_4</scheme>
-      <scheme>cnvc90</scheme>
-      <scheme>GFS_MP_generic_pre</scheme>
-      <scheme>zhaocarr_gscond</scheme>
-      <scheme>zhaocarr_precpd</scheme>
-      <scheme>GFS_MP_generic_post</scheme>
-      <scheme>maximum_hourly_diagnostics</scheme>
-      <scheme>phys_tend</scheme>
-    </subcycle>
-  </group>
-  <group name="stochastics">
-    <subcycle loop="1">
-      <scheme>GFS_stochastics</scheme>
-    </subcycle>
-  </group>
-  <!-- <finalize></finalize> -->
-</suite>
diff --git a/ccpp/suites/suite_FV3_GFS_2017_gfdlmp.xml b/ccpp/suites/suite_FV3_GFS_2017_gfdlmp.xml
deleted file mode 100644
index 5381bc907..000000000
--- a/ccpp/suites/suite_FV3_GFS_2017_gfdlmp.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="FV3_GFS_2017_gfdlmp" version="1">
-  <!-- <init></init> -->
-  <group name="fast_physics">
-    <subcycle loop="1">
-      <scheme>fv_sat_adj</scheme>
-    </subcycle>
-  </group>
-  <group name="time_vary">
-    <subcycle loop="1">
-      <scheme>GFS_time_vary_pre</scheme>
-      <scheme>GFS_rrtmg_setup</scheme>
-      <scheme>GFS_rad_time_vary</scheme>
-      <scheme>GFS_phys_time_vary</scheme>
-    </subcycle>
-  </group>
-  <group name="radiation">
-    <subcycle loop="1">
-      <scheme>GFS_suite_interstitial_rad_reset</scheme>
-      <scheme>GFS_rrtmg_pre</scheme>
-      <scheme>GFS_radiation_surface</scheme>
-      <scheme>rrtmg_sw_pre</scheme>
-      <scheme>rrtmg_sw</scheme>
-      <scheme>rrtmg_sw_post</scheme>
-      <scheme>rrtmg_lw_pre</scheme>
-      <scheme>rrtmg_lw</scheme>
-      <scheme>rrtmg_lw_post</scheme>
-      <scheme>GFS_rrtmg_post</scheme>
-    </subcycle>
-  </group>
-  <group name="physics">
-    <subcycle loop="1">
-      <scheme>GFS_suite_interstitial_phys_reset</scheme>
-      <scheme>GFS_suite_stateout_reset</scheme>
-      <scheme>get_prs_fv3</scheme>
-      <scheme>GFS_suite_interstitial_1</scheme>
-      <scheme>GFS_surface_generic_pre</scheme>
-      <scheme>GFS_surface_composites_pre</scheme>
-      <scheme>dcyc2t3</scheme>
-      <scheme>GFS_surface_composites_inter</scheme>
-      <scheme>GFS_suite_interstitial_2</scheme>
-    </subcycle>
-    <!-- Surface iteration loop -->
-    <subcycle loop="2">
-      <scheme>sfc_diff</scheme>
-      <scheme>GFS_surface_loop_control_part1</scheme>
-      <scheme>sfc_nst_pre</scheme>
-      <scheme>sfc_nst</scheme>
-      <scheme>sfc_nst_post</scheme>
-      <scheme>lsm_noah</scheme>
-      <scheme>sfc_sice</scheme>
-      <scheme>GFS_surface_loop_control_part2</scheme>
-    </subcycle>
-    <!-- End of surface iteration loop -->
-    <subcycle loop="1">
-      <scheme>GFS_surface_composites_post</scheme>
-      <scheme>sfc_diag</scheme>
-      <scheme>sfc_diag_post</scheme>
-      <scheme>GFS_surface_generic_post</scheme>
-      <scheme>GFS_PBL_generic_pre</scheme>
-      <scheme>hedmf</scheme>
-      <scheme>GFS_PBL_generic_post</scheme>
-      <scheme>GFS_GWD_generic_pre</scheme>
-      <scheme>cires_ugwp</scheme>
-      <scheme>cires_ugwp_post</scheme>
-      <scheme>GFS_GWD_generic_post</scheme>
-      <scheme>rayleigh_damp</scheme>
-      <scheme>GFS_suite_stateout_update</scheme>
-      <scheme>ozphys</scheme>
-      <scheme>get_phi_fv3</scheme>
-      <scheme>GFS_suite_interstitial_3</scheme>
-      <scheme>GFS_DCNV_generic_pre</scheme>
-      <scheme>samfdeepcnv</scheme>
-      <scheme>GFS_DCNV_generic_post</scheme>
-      <scheme>GFS_SCNV_generic_pre</scheme>
-      <scheme>samfshalcnv</scheme>
-      <scheme>GFS_SCNV_generic_post</scheme>
-      <scheme>GFS_suite_interstitial_4</scheme>
-      <scheme>cnvc90</scheme>
-      <scheme>GFS_MP_generic_pre</scheme>
-      <scheme>gfdl_cloud_microphys</scheme>
-      <scheme>GFS_MP_generic_post</scheme>
-      <scheme>maximum_hourly_diagnostics</scheme>
-      <scheme>phys_tend</scheme>
-    </subcycle>
-  </group>
-  <group name="stochastics">
-    <subcycle loop="1">
-      <scheme>GFS_stochastics</scheme>
-    </subcycle>
-  </group>
-  <!-- <finalize></finalize> -->
-</suite>
diff --git a/ccpp/suites/suite_FV3_GFS_2017_gfdlmp_noahmp.xml b/ccpp/suites/suite_FV3_GFS_2017_gfdlmp_noahmp.xml
deleted file mode 100644
index 8693fd58f..000000000
--- a/ccpp/suites/suite_FV3_GFS_2017_gfdlmp_noahmp.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="FV3_GFS_2017_gfdlmp_noahmp" version="1">
-  <!-- <init></init> -->
-  <group name="fast_physics">
-    <subcycle loop="1">
-      <scheme>fv_sat_adj</scheme>
-    </subcycle>
-  </group>
-  <group name="time_vary">
-    <subcycle loop="1">
-      <scheme>GFS_time_vary_pre</scheme>
-      <scheme>GFS_rrtmg_setup</scheme>
-      <scheme>GFS_rad_time_vary</scheme>
-      <scheme>GFS_phys_time_vary</scheme>
-    </subcycle>
-  </group>
-  <group name="radiation">
-    <subcycle loop="1">
-      <scheme>GFS_suite_interstitial_rad_reset</scheme>
-      <scheme>GFS_rrtmg_pre</scheme>
-      <scheme>GFS_radiation_surface</scheme>
-      <scheme>rrtmg_sw_pre</scheme>
-      <scheme>rrtmg_sw</scheme>
-      <scheme>rrtmg_sw_post</scheme>
-      <scheme>rrtmg_lw_pre</scheme>
-      <scheme>rrtmg_lw</scheme>
-      <scheme>rrtmg_lw_post</scheme>
-      <scheme>GFS_rrtmg_post</scheme>
-    </subcycle>
-  </group>
-  <group name="physics">
-    <subcycle loop="1">
-      <scheme>GFS_suite_interstitial_phys_reset</scheme>
-      <scheme>GFS_suite_stateout_reset</scheme>
-      <scheme>get_prs_fv3</scheme>
-      <scheme>GFS_suite_interstitial_1</scheme>
-      <scheme>GFS_surface_generic_pre</scheme>
-      <scheme>GFS_surface_composites_pre</scheme>
-      <scheme>dcyc2t3</scheme>
-      <scheme>GFS_surface_composites_inter</scheme>
-      <scheme>GFS_suite_interstitial_2</scheme>
-    </subcycle>
-    <!-- Surface iteration loop -->
-    <subcycle loop="2">
-      <scheme>sfc_diff</scheme>
-      <scheme>GFS_surface_loop_control_part1</scheme>
-      <scheme>sfc_nst_pre</scheme>
-      <scheme>sfc_nst</scheme>
-      <scheme>sfc_nst_post</scheme>
-      <scheme>noahmpdrv</scheme>
-      <scheme>sfc_sice</scheme>
-      <scheme>GFS_surface_loop_control_part2</scheme>
-    </subcycle>
-    <!-- End of surface iteration loop -->
-    <subcycle loop="1">
-      <scheme>GFS_surface_composites_post</scheme>
-      <scheme>sfc_diag</scheme>
-      <scheme>sfc_diag_post</scheme>
-      <scheme>GFS_surface_generic_post</scheme>
-      <scheme>GFS_PBL_generic_pre</scheme>
-      <scheme>hedmf</scheme>
-      <scheme>GFS_PBL_generic_post</scheme>
-      <scheme>GFS_GWD_generic_pre</scheme>
-      <scheme>cires_ugwp</scheme>
-      <scheme>cires_ugwp_post</scheme>
-      <scheme>GFS_GWD_generic_post</scheme>
-      <scheme>rayleigh_damp</scheme>
-      <scheme>GFS_suite_stateout_update</scheme>
-      <scheme>ozphys</scheme>
-      <scheme>get_phi_fv3</scheme>
-      <scheme>GFS_suite_interstitial_3</scheme>
-      <scheme>GFS_DCNV_generic_pre</scheme>
-      <scheme>samfdeepcnv</scheme>
-      <scheme>GFS_DCNV_generic_post</scheme>
-      <scheme>GFS_SCNV_generic_pre</scheme>
-      <scheme>samfshalcnv</scheme>
-      <scheme>GFS_SCNV_generic_post</scheme>
-      <scheme>GFS_suite_interstitial_4</scheme>
-      <scheme>cnvc90</scheme>
-      <scheme>GFS_MP_generic_pre</scheme>
-      <scheme>gfdl_cloud_microphys</scheme>
-      <scheme>GFS_MP_generic_post</scheme>
-      <scheme>maximum_hourly_diagnostics</scheme>
-      <scheme>phys_tend</scheme>
-    </subcycle>
-  </group>
-  <group name="stochastics">
-    <subcycle loop="1">
-      <scheme>GFS_stochastics</scheme>
-    </subcycle>
-  </group>
-  <!-- <finalize></finalize> -->
-</suite>
diff --git a/ccpp/suites/suite_FV3_GFS_2017_gfdlmp_regional.xml b/ccpp/suites/suite_FV3_GFS_2017_gfdlmp_regional.xml
deleted file mode 100644
index de3e17c33..000000000
--- a/ccpp/suites/suite_FV3_GFS_2017_gfdlmp_regional.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="FV3_GFS_2017_gfdlmp_regional" version="1">
-  <!-- <init></init> -->
-  <group name="fast_physics">
-    <subcycle loop="1">
-      <scheme>fv_sat_adj</scheme>
-    </subcycle>
-  </group>
-  <group name="time_vary">
-    <subcycle loop="1">
-      <scheme>GFS_time_vary_pre</scheme>
-      <scheme>GFS_rrtmg_setup</scheme>
-      <scheme>GFS_rad_time_vary</scheme>
-      <scheme>GFS_phys_time_vary</scheme>
-    </subcycle>
-  </group>
-  <group name="radiation">
-    <subcycle loop="1">
-      <scheme>GFS_suite_interstitial_rad_reset</scheme>
-      <scheme>GFS_rrtmg_pre</scheme>
-      <scheme>GFS_radiation_surface</scheme>
-      <scheme>rrtmg_sw_pre</scheme>
-      <scheme>rrtmg_sw</scheme>
-      <scheme>rrtmg_sw_post</scheme>
-      <scheme>rrtmg_lw_pre</scheme>
-      <scheme>rrtmg_lw</scheme>
-      <scheme>rrtmg_lw_post</scheme>
-      <scheme>GFS_rrtmg_post</scheme>
-    </subcycle>
-  </group>
-  <group name="physics">
-    <subcycle loop="1">
-      <scheme>GFS_suite_interstitial_phys_reset</scheme>
-      <scheme>GFS_suite_stateout_reset</scheme>
-      <scheme>get_prs_fv3</scheme>
-      <scheme>GFS_suite_interstitial_1</scheme>
-      <scheme>GFS_surface_generic_pre</scheme>
-      <scheme>GFS_surface_composites_pre</scheme>
-      <scheme>dcyc2t3</scheme>
-      <scheme>GFS_surface_composites_inter</scheme>
-      <scheme>GFS_suite_interstitial_2</scheme>
-    </subcycle>
-    <!-- Surface iteration loop -->
-    <subcycle loop="2">
-      <scheme>sfc_diff</scheme>
-      <scheme>GFS_surface_loop_control_part1</scheme>
-      <scheme>sfc_nst_pre</scheme>
-      <scheme>sfc_nst</scheme>
-      <scheme>sfc_nst_post</scheme>
-      <scheme>lsm_noah</scheme>
-      <scheme>sfc_sice</scheme>
-      <scheme>GFS_surface_loop_control_part2</scheme>
-    </subcycle>
-    <!-- End of surface iteration loop -->
-    <subcycle loop="1">
-      <scheme>GFS_surface_composites_post</scheme>
-      <scheme>sfc_diag</scheme>
-      <scheme>sfc_diag_post</scheme>
-      <scheme>GFS_surface_generic_post</scheme>
-      <scheme>GFS_PBL_generic_pre</scheme>
-      <scheme>hedmf</scheme>
-      <scheme>GFS_PBL_generic_post</scheme>
-      <scheme>GFS_GWD_generic_pre</scheme>
-      <scheme>cires_ugwp</scheme>
-      <scheme>cires_ugwp_post</scheme>
-      <scheme>GFS_GWD_generic_post</scheme>
-      <scheme>rayleigh_damp</scheme>
-      <scheme>GFS_suite_stateout_update</scheme>
-      <scheme>ozphys_2015</scheme>
-      <scheme>h2ophys</scheme>
-      <scheme>get_phi_fv3</scheme>
-      <scheme>GFS_suite_interstitial_3</scheme>
-      <scheme>GFS_DCNV_generic_pre</scheme>
-      <scheme>samfdeepcnv</scheme>
-      <scheme>GFS_DCNV_generic_post</scheme>
-      <scheme>GFS_SCNV_generic_pre</scheme>
-      <scheme>samfshalcnv</scheme>
-      <scheme>GFS_SCNV_generic_post</scheme>
-      <scheme>GFS_suite_interstitial_4</scheme>
-      <scheme>cnvc90</scheme>
-      <scheme>GFS_MP_generic_pre</scheme>
-      <scheme>gfdl_cloud_microphys</scheme>
-      <scheme>GFS_MP_generic_post</scheme>
-      <scheme>maximum_hourly_diagnostics</scheme>
-      <scheme>phys_tend</scheme>
-    </subcycle>
-  </group>
-  <group name="stochastics">
-    <subcycle loop="1">
-      <scheme>GFS_stochastics</scheme>
-    </subcycle>
-  </group>
-  <!-- <finalize></finalize> -->
-</suite>
diff --git a/ccpp/suites/suite_FV3_GFS_2017_h2ophys.xml b/ccpp/suites/suite_FV3_GFS_2017_h2ophys.xml
deleted file mode 100644
index ab38042b5..000000000
--- a/ccpp/suites/suite_FV3_GFS_2017_h2ophys.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="FV3_GFS_2017_h2ophys" version="1">
-  <!-- <init></init> -->
-  <group name="time_vary">
-    <subcycle loop="1">
-      <scheme>GFS_time_vary_pre</scheme>
-      <scheme>GFS_rrtmg_setup</scheme>
-      <scheme>GFS_rad_time_vary</scheme>
-      <scheme>GFS_phys_time_vary</scheme>
-    </subcycle>
-  </group>
-  <group name="radiation">
-    <subcycle loop="1">
-      <scheme>GFS_suite_interstitial_rad_reset</scheme>
-      <scheme>GFS_rrtmg_pre</scheme>
-      <scheme>GFS_radiation_surface</scheme>
-      <scheme>rrtmg_sw_pre</scheme>
-      <scheme>rrtmg_sw</scheme>
-      <scheme>rrtmg_sw_post</scheme>
-      <scheme>rrtmg_lw_pre</scheme>
-      <scheme>rrtmg_lw</scheme>
-      <scheme>rrtmg_lw_post</scheme>
-      <scheme>GFS_rrtmg_post</scheme>
-    </subcycle>
-  </group>
-  <group name="physics">
-    <subcycle loop="1">
-      <scheme>GFS_suite_interstitial_phys_reset</scheme>
-      <scheme>GFS_suite_stateout_reset</scheme>
-      <scheme>get_prs_fv3</scheme>
-      <scheme>GFS_suite_interstitial_1</scheme>
-      <scheme>GFS_surface_generic_pre</scheme>
-      <scheme>GFS_surface_composites_pre</scheme>
-      <scheme>dcyc2t3</scheme>
-      <scheme>GFS_surface_composites_inter</scheme>
-      <scheme>GFS_suite_interstitial_2</scheme>
-    </subcycle>
-    <!-- Surface iteration loop -->
-    <subcycle loop="2">
-      <scheme>sfc_diff</scheme>
-      <scheme>GFS_surface_loop_control_part1</scheme>
-      <scheme>sfc_nst_pre</scheme>
-      <scheme>sfc_nst</scheme>
-      <scheme>sfc_nst_post</scheme>
-      <scheme>lsm_noah</scheme>
-      <scheme>sfc_sice</scheme>
-      <scheme>GFS_surface_loop_control_part2</scheme>
-    </subcycle>
-    <!-- End of surface iteration loop -->
-    <subcycle loop="1">
-      <scheme>GFS_surface_composites_post</scheme>
-      <scheme>sfc_diag</scheme>
-      <scheme>sfc_diag_post</scheme>
-      <scheme>GFS_surface_generic_post</scheme>
-      <scheme>GFS_PBL_generic_pre</scheme>
-      <scheme>hedmf</scheme>
-      <scheme>GFS_PBL_generic_post</scheme>
-      <scheme>GFS_GWD_generic_pre</scheme>
-      <scheme>cires_ugwp</scheme>
-      <scheme>cires_ugwp_post</scheme>
-      <scheme>GFS_GWD_generic_post</scheme>
-      <scheme>rayleigh_damp</scheme>
-      <scheme>GFS_suite_stateout_update</scheme>
-      <scheme>ozphys</scheme>
-      <scheme>h2ophys</scheme>
-      <scheme>get_phi_fv3</scheme>
-      <scheme>GFS_suite_interstitial_3</scheme>
-      <scheme>GFS_DCNV_generic_pre</scheme>
-      <scheme>samfdeepcnv</scheme>
-      <scheme>GFS_DCNV_generic_post</scheme>
-      <scheme>GFS_SCNV_generic_pre</scheme>
-      <scheme>samfshalcnv</scheme>
-      <scheme>GFS_SCNV_generic_post</scheme>
-      <scheme>GFS_suite_interstitial_4</scheme>
-      <scheme>cnvc90</scheme>
-      <scheme>GFS_MP_generic_pre</scheme>
-      <scheme>zhaocarr_gscond</scheme>
-      <scheme>zhaocarr_precpd</scheme>
-      <scheme>GFS_MP_generic_post</scheme>
-      <scheme>maximum_hourly_diagnostics</scheme>
-      <scheme>phys_tend</scheme>
-    </subcycle>
-  </group>
-  <group name="stochastics">
-    <subcycle loop="1">
-      <scheme>GFS_stochastics</scheme>
-    </subcycle>
-  </group>
-  <!-- <finalize></finalize> -->
-</suite>
diff --git a/ccpp/suites/suite_FV3_GFS_2017_ozphys_2015.xml b/ccpp/suites/suite_FV3_GFS_2017_ozphys_2015.xml
deleted file mode 100644
index 3599c38bc..000000000
--- a/ccpp/suites/suite_FV3_GFS_2017_ozphys_2015.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="FV3_GFS_2017_ozphys_2015" version="1">
-  <!-- <init></init> -->
-  <group name="time_vary">
-    <subcycle loop="1">
-      <scheme>GFS_time_vary_pre</scheme>
-      <scheme>GFS_rrtmg_setup</scheme>
-      <scheme>GFS_rad_time_vary</scheme>
-      <scheme>GFS_phys_time_vary</scheme>
-    </subcycle>
-  </group>
-  <group name="radiation">
-    <subcycle loop="1">
-      <scheme>GFS_suite_interstitial_rad_reset</scheme>
-      <scheme>GFS_rrtmg_pre</scheme>
-      <scheme>GFS_radiation_surface</scheme>
-      <scheme>rrtmg_sw_pre</scheme>
-      <scheme>rrtmg_sw</scheme>
-      <scheme>rrtmg_sw_post</scheme>
-      <scheme>rrtmg_lw_pre</scheme>
-      <scheme>rrtmg_lw</scheme>
-      <scheme>rrtmg_lw_post</scheme>
-      <scheme>GFS_rrtmg_post</scheme>
-    </subcycle>
-  </group>
-  <group name="physics">
-    <subcycle loop="1">
-      <scheme>GFS_suite_interstitial_phys_reset</scheme>
-      <scheme>GFS_suite_stateout_reset</scheme>
-      <scheme>get_prs_fv3</scheme>
-      <scheme>GFS_suite_interstitial_1</scheme>
-      <scheme>GFS_surface_generic_pre</scheme>
-      <scheme>GFS_surface_composites_pre</scheme>
-      <scheme>dcyc2t3</scheme>
-      <scheme>GFS_surface_composites_inter</scheme>
-      <scheme>GFS_suite_interstitial_2</scheme>
-    </subcycle>
-    <!-- Surface iteration loop -->
-    <subcycle loop="2">
-      <scheme>sfc_diff</scheme>
-      <scheme>GFS_surface_loop_control_part1</scheme>
-      <scheme>sfc_nst_pre</scheme>
-      <scheme>sfc_nst</scheme>
-      <scheme>sfc_nst_post</scheme>
-      <scheme>lsm_noah</scheme>
-      <scheme>sfc_sice</scheme>
-      <scheme>GFS_surface_loop_control_part2</scheme>
-    </subcycle>
-    <!-- End of surface iteration loop -->
-    <subcycle loop="1">
-      <scheme>GFS_surface_composites_post</scheme>
-      <scheme>sfc_diag</scheme>
-      <scheme>sfc_diag_post</scheme>
-      <scheme>GFS_surface_generic_post</scheme>
-      <scheme>GFS_PBL_generic_pre</scheme>
-      <scheme>hedmf</scheme>
-      <scheme>GFS_PBL_generic_post</scheme>
-      <scheme>GFS_GWD_generic_pre</scheme>
-      <scheme>cires_ugwp</scheme>
-      <scheme>cires_ugwp_post</scheme>
-      <scheme>GFS_GWD_generic_post</scheme>
-      <scheme>rayleigh_damp</scheme>
-      <scheme>GFS_suite_stateout_update</scheme>
-      <scheme>ozphys_2015</scheme>
-      <scheme>get_phi_fv3</scheme>
-      <scheme>GFS_suite_interstitial_3</scheme>
-      <scheme>GFS_DCNV_generic_pre</scheme>
-      <scheme>samfdeepcnv</scheme>
-      <scheme>GFS_DCNV_generic_post</scheme>
-      <scheme>GFS_SCNV_generic_pre</scheme>
-      <scheme>samfshalcnv</scheme>
-      <scheme>GFS_SCNV_generic_post</scheme>
-      <scheme>GFS_suite_interstitial_4</scheme>
-      <scheme>cnvc90</scheme>
-      <scheme>GFS_MP_generic_pre</scheme>
-      <scheme>zhaocarr_gscond</scheme>
-      <scheme>zhaocarr_precpd</scheme>
-      <scheme>GFS_MP_generic_post</scheme>
-      <scheme>maximum_hourly_diagnostics</scheme>
-      <scheme>phys_tend</scheme>
-    </subcycle>
-  </group>
-  <group name="stochastics">
-    <subcycle loop="1">
-      <scheme>GFS_stochastics</scheme>
-    </subcycle>
-  </group>
-  <!-- <finalize></finalize> -->
-</suite>
diff --git a/ccpp/suites/suite_FV3_GFS_2017_sas.xml b/ccpp/suites/suite_FV3_GFS_2017_sas.xml
deleted file mode 100644
index d3199a8f9..000000000
--- a/ccpp/suites/suite_FV3_GFS_2017_sas.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="FV3_GFS_2017_sas" version="1">
-  <!-- <init></init> -->
-  <group name="fast_physics">
-    <subcycle loop="1">
-      <scheme>fv_sat_adj</scheme>
-    </subcycle>
-  </group>
-  <group name="time_vary">
-    <subcycle loop="1">
-      <scheme>GFS_time_vary_pre</scheme>
-      <scheme>GFS_rrtmg_setup</scheme>
-      <scheme>GFS_rad_time_vary</scheme>
-      <scheme>GFS_phys_time_vary</scheme>
-    </subcycle>
-  </group>
-  <group name="radiation">
-    <subcycle loop="1">
-      <scheme>GFS_suite_interstitial_rad_reset</scheme>
-      <scheme>GFS_rrtmg_pre</scheme>
-      <scheme>GFS_radiation_surface</scheme>
-      <scheme>rrtmg_sw_pre</scheme>
-      <scheme>rrtmg_sw</scheme>
-      <scheme>rrtmg_sw_post</scheme>
-      <scheme>rrtmg_lw_pre</scheme>
-      <scheme>rrtmg_lw</scheme>
-      <scheme>rrtmg_lw_post</scheme>
-      <scheme>GFS_rrtmg_post</scheme>
-    </subcycle>
-  </group>
-  <group name="physics">
-    <subcycle loop="1">
-      <scheme>GFS_suite_interstitial_phys_reset</scheme>
-      <scheme>GFS_suite_stateout_reset</scheme>
-      <scheme>get_prs_fv3</scheme>
-      <scheme>GFS_suite_interstitial_1</scheme>
-      <scheme>GFS_surface_generic_pre</scheme>
-      <scheme>GFS_surface_composites_pre</scheme>
-      <scheme>dcyc2t3</scheme>
-      <scheme>GFS_surface_composites_inter</scheme>
-      <scheme>GFS_suite_interstitial_2</scheme>
-    </subcycle>
-    <!-- Surface iteration loop -->
-    <subcycle loop="2">
-      <scheme>sfc_diff</scheme>
-      <scheme>GFS_surface_loop_control_part1</scheme>
-      <scheme>sfc_nst_pre</scheme>
-      <scheme>sfc_nst</scheme>
-      <scheme>sfc_nst_post</scheme>
-      <scheme>lsm_noah</scheme>
-      <scheme>sfc_sice</scheme>
-      <scheme>GFS_surface_loop_control_part2</scheme>
-    </subcycle>
-    <!-- End of surface iteration loop -->
-    <subcycle loop="1">
-      <scheme>GFS_surface_composites_post</scheme>
-      <scheme>sfc_diag</scheme>
-      <scheme>sfc_diag_post</scheme>
-      <scheme>GFS_surface_generic_post</scheme>
-      <scheme>GFS_PBL_generic_pre</scheme>
-      <scheme>hedmf</scheme>
-      <scheme>GFS_PBL_generic_post</scheme>
-      <scheme>GFS_GWD_generic_pre</scheme>
-      <scheme>cires_ugwp</scheme>
-      <scheme>cires_ugwp_post</scheme>
-      <scheme>GFS_GWD_generic_post</scheme>
-      <scheme>rayleigh_damp</scheme>
-      <scheme>GFS_suite_stateout_update</scheme>
-      <scheme>ozphys</scheme>
-      <scheme>get_phi_fv3</scheme>
-      <scheme>GFS_suite_interstitial_3</scheme>
-      <scheme>GFS_DCNV_generic_pre</scheme>
-      <scheme>sascnvn</scheme>
-      <scheme>GFS_DCNV_generic_post</scheme>
-      <scheme>GFS_SCNV_generic_pre</scheme>
-      <scheme>shalcnv</scheme>
-      <scheme>GFS_SCNV_generic_post</scheme>
-      <scheme>GFS_suite_interstitial_4</scheme>
-      <scheme>cnvc90</scheme>
-      <scheme>GFS_MP_generic_pre</scheme>
-      <scheme>gfdl_cloud_microphys</scheme>
-      <scheme>GFS_MP_generic_post</scheme>
-      <scheme>maximum_hourly_diagnostics</scheme>
-      <scheme>phys_tend</scheme>
-    </subcycle>
-  </group>
-  <group name="stochastics">
-    <subcycle loop="1">
-      <scheme>GFS_stochastics</scheme>
-    </subcycle>
-  </group>
-  <!-- <finalize></finalize> -->
-</suite>
diff --git a/ccpp/suites/suite_FV3_GFS_2017_satmedmf.xml b/ccpp/suites/suite_FV3_GFS_2017_satmedmf.xml
deleted file mode 100644
index 5e85b453a..000000000
--- a/ccpp/suites/suite_FV3_GFS_2017_satmedmf.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="FV3_GFS_2017_satmedmf" version="1">
-  <!-- <init></init> -->
-  <group name="time_vary">
-    <subcycle loop="1">
-      <scheme>GFS_time_vary_pre</scheme>
-      <scheme>GFS_rrtmg_setup</scheme>
-      <scheme>GFS_rad_time_vary</scheme>
-      <scheme>GFS_phys_time_vary</scheme>
-    </subcycle>
-  </group>
-  <group name="radiation">
-    <subcycle loop="1">
-      <scheme>GFS_suite_interstitial_rad_reset</scheme>
-      <scheme>GFS_rrtmg_pre</scheme>
-      <scheme>GFS_radiation_surface</scheme>
-      <scheme>rrtmg_sw_pre</scheme>
-      <scheme>rrtmg_sw</scheme>
-      <scheme>rrtmg_sw_post</scheme>
-      <scheme>rrtmg_lw_pre</scheme>
-      <scheme>rrtmg_lw</scheme>
-      <scheme>rrtmg_lw_post</scheme>
-      <scheme>GFS_rrtmg_post</scheme>
-    </subcycle>
-  </group>
-  <group name="physics">
-    <subcycle loop="1">
-      <scheme>GFS_suite_interstitial_phys_reset</scheme>
-      <scheme>GFS_suite_stateout_reset</scheme>
-      <scheme>get_prs_fv3</scheme>
-      <scheme>GFS_suite_interstitial_1</scheme>
-      <scheme>GFS_surface_generic_pre</scheme>
-      <scheme>GFS_surface_composites_pre</scheme>
-      <scheme>dcyc2t3</scheme>
-      <scheme>GFS_surface_composites_inter</scheme>
-      <scheme>GFS_suite_interstitial_2</scheme>
-    </subcycle>
-    <!-- Surface iteration loop -->
-    <subcycle loop="2">
-      <scheme>sfc_diff</scheme>
-      <scheme>GFS_surface_loop_control_part1</scheme>
-      <scheme>sfc_nst_pre</scheme>
-      <scheme>sfc_nst</scheme>
-      <scheme>sfc_nst_post</scheme>
-      <scheme>lsm_noah</scheme>
-      <scheme>sfc_sice</scheme>
-      <scheme>GFS_surface_loop_control_part2</scheme>
-    </subcycle>
-    <!-- End of surface iteration loop -->
-    <subcycle loop="1">
-      <scheme>GFS_surface_composites_post</scheme>
-      <scheme>sfc_diag</scheme>
-      <scheme>sfc_diag_post</scheme>
-      <scheme>GFS_surface_generic_post</scheme>
-      <scheme>GFS_PBL_generic_pre</scheme>
-      <scheme>satmedmfvdif</scheme>
-      <scheme>GFS_PBL_generic_post</scheme>
-      <scheme>GFS_GWD_generic_pre</scheme>
-      <scheme>cires_ugwp</scheme>
-      <scheme>cires_ugwp_post</scheme>
-      <scheme>GFS_GWD_generic_post</scheme>
-      <scheme>rayleigh_damp</scheme>
-      <scheme>GFS_suite_stateout_update</scheme>
-      <scheme>ozphys</scheme>
-      <scheme>get_phi_fv3</scheme>
-      <scheme>GFS_suite_interstitial_3</scheme>
-      <scheme>GFS_DCNV_generic_pre</scheme>
-      <scheme>samfdeepcnv</scheme>
-      <scheme>GFS_DCNV_generic_post</scheme>
-      <scheme>GFS_SCNV_generic_pre</scheme>
-      <scheme>samfshalcnv</scheme>
-      <scheme>GFS_SCNV_generic_post</scheme>
-      <scheme>GFS_suite_interstitial_4</scheme>
-      <scheme>cnvc90</scheme>
-      <scheme>GFS_MP_generic_pre</scheme>
-      <scheme>zhaocarr_gscond</scheme>
-      <scheme>zhaocarr_precpd</scheme>
-      <scheme>GFS_MP_generic_post</scheme>
-      <scheme>maximum_hourly_diagnostics</scheme>
-      <scheme>phys_tend</scheme>
-    </subcycle>
-  </group>
-  <group name="stochastics">
-    <subcycle loop="1">
-      <scheme>GFS_stochastics</scheme>
-    </subcycle>
-  </group>
-  <!-- <finalize></finalize> -->
-</suite>
diff --git a/ccpp/suites/suite_FV3_GFS_2017_satmedmf_coupled.xml b/ccpp/suites/suite_FV3_GFS_2017_satmedmf_coupled.xml
deleted file mode 100644
index 67daf00d8..000000000
--- a/ccpp/suites/suite_FV3_GFS_2017_satmedmf_coupled.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="FV3_GFS_2017_satmedmf_coupled" version="1">
-  <!-- <init></init> -->
-  <group name="time_vary">
-    <subcycle loop="1">
-      <scheme>GFS_time_vary_pre</scheme>
-      <scheme>GFS_rrtmg_setup</scheme>
-      <scheme>GFS_rad_time_vary</scheme>
-      <scheme>GFS_phys_time_vary</scheme>
-    </subcycle>
-  </group>
-  <group name="radiation">
-    <subcycle loop="1">
-      <scheme>GFS_suite_interstitial_rad_reset</scheme>
-      <scheme>GFS_rrtmg_pre</scheme>
-      <scheme>GFS_radiation_surface</scheme>
-      <scheme>rrtmg_sw_pre</scheme>
-      <scheme>rrtmg_sw</scheme>
-      <scheme>rrtmg_sw_post</scheme>
-      <scheme>rrtmg_lw_pre</scheme>
-      <scheme>rrtmg_lw</scheme>
-      <scheme>rrtmg_lw_post</scheme>
-      <scheme>GFS_rrtmg_post</scheme>
-    </subcycle>
-  </group>
-  <group name="physics">
-    <subcycle loop="1">
-      <scheme>GFS_suite_interstitial_phys_reset</scheme>
-      <scheme>GFS_suite_stateout_reset</scheme>
-      <scheme>get_prs_fv3</scheme>
-      <scheme>GFS_suite_interstitial_1</scheme>
-      <scheme>GFS_surface_generic_pre</scheme>
-      <scheme>GFS_surface_composites_pre</scheme>
-      <scheme>dcyc2t3</scheme>
-      <scheme>GFS_surface_composites_inter</scheme>
-      <scheme>GFS_suite_interstitial_2</scheme>
-    </subcycle>
-    <!-- Surface iteration loop -->
-    <subcycle loop="2">
-      <scheme>sfc_diff</scheme>
-      <scheme>GFS_surface_loop_control_part1</scheme>
-      <scheme>sfc_ocean</scheme>
-      <scheme>lsm_noah</scheme>
-      <scheme>sfc_cice</scheme>
-      <scheme>sfc_sice</scheme>
-      <scheme>GFS_surface_loop_control_part2</scheme>
-    </subcycle>
-    <!-- End of surface iteration loop -->
-    <subcycle loop="1">
-      <scheme>GFS_surface_composites_post</scheme>
-      <scheme>sfc_diag</scheme>
-      <scheme>sfc_diag_post</scheme>
-      <scheme>GFS_surface_generic_post</scheme>
-      <scheme>GFS_PBL_generic_pre</scheme>
-      <scheme>satmedmfvdif</scheme>
-      <scheme>GFS_PBL_generic_post</scheme>
-      <scheme>GFS_GWD_generic_pre</scheme>
-      <scheme>cires_ugwp</scheme>
-      <scheme>cires_ugwp_post</scheme>
-      <scheme>GFS_GWD_generic_post</scheme>
-      <scheme>rayleigh_damp</scheme>
-      <scheme>GFS_suite_stateout_update</scheme>
-      <scheme>ozphys</scheme>
-      <scheme>get_phi_fv3</scheme>
-      <scheme>GFS_suite_interstitial_3</scheme>
-      <scheme>GFS_DCNV_generic_pre</scheme>
-      <scheme>samfdeepcnv</scheme>
-      <scheme>GFS_DCNV_generic_post</scheme>
-      <scheme>GFS_SCNV_generic_pre</scheme>
-      <scheme>samfshalcnv</scheme>
-      <scheme>GFS_SCNV_generic_post</scheme>
-      <scheme>GFS_suite_interstitial_4</scheme>
-      <scheme>cnvc90</scheme>
-      <scheme>GFS_MP_generic_pre</scheme>
-      <scheme>zhaocarr_gscond</scheme>
-      <scheme>zhaocarr_precpd</scheme>
-      <scheme>GFS_MP_generic_post</scheme>
-      <scheme>maximum_hourly_diagnostics</scheme>
-      <scheme>phys_tend</scheme>
-    </subcycle>
-  </group>
-  <group name="stochastics">
-    <subcycle loop="1">
-      <scheme>GFS_stochastics</scheme>
-    </subcycle>
-  </group>
-  <!-- <finalize></finalize> -->
-</suite>
diff --git a/ccpp/suites/suite_FV3_GFS_2017_satmedmfq.xml b/ccpp/suites/suite_FV3_GFS_2017_satmedmfq.xml
deleted file mode 100644
index 71c9c86d0..000000000
--- a/ccpp/suites/suite_FV3_GFS_2017_satmedmfq.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="FV3_GFS_2017_satmedmfq" version="1">
-  <!-- <init></init> -->
-  <group name="time_vary">
-    <subcycle loop="1">
-      <scheme>GFS_time_vary_pre</scheme>
-      <scheme>GFS_rrtmg_setup</scheme>
-      <scheme>GFS_rad_time_vary</scheme>
-      <scheme>GFS_phys_time_vary</scheme>
-    </subcycle>
-  </group>
-  <group name="radiation">
-    <subcycle loop="1">
-      <scheme>GFS_suite_interstitial_rad_reset</scheme>
-      <scheme>GFS_rrtmg_pre</scheme>
-      <scheme>GFS_radiation_surface</scheme>
-      <scheme>rrtmg_sw_pre</scheme>
-      <scheme>rrtmg_sw</scheme>
-      <scheme>rrtmg_sw_post</scheme>
-      <scheme>rrtmg_lw_pre</scheme>
-      <scheme>rrtmg_lw</scheme>
-      <scheme>rrtmg_lw_post</scheme>
-      <scheme>GFS_rrtmg_post</scheme>
-    </subcycle>
-  </group>
-  <group name="physics">
-    <subcycle loop="1">
-      <scheme>GFS_suite_interstitial_phys_reset</scheme>
-      <scheme>GFS_suite_stateout_reset</scheme>
-      <scheme>get_prs_fv3</scheme>
-      <scheme>GFS_suite_interstitial_1</scheme>
-      <scheme>GFS_surface_generic_pre</scheme>
-      <scheme>GFS_surface_composites_pre</scheme>
-      <scheme>dcyc2t3</scheme>
-      <scheme>GFS_surface_composites_inter</scheme>
-      <scheme>GFS_suite_interstitial_2</scheme>
-    </subcycle>
-    <!-- Surface iteration loop -->
-    <subcycle loop="2">
-      <scheme>sfc_diff</scheme>
-      <scheme>GFS_surface_loop_control_part1</scheme>
-      <scheme>sfc_nst_pre</scheme>
-      <scheme>sfc_nst</scheme>
-      <scheme>sfc_nst_post</scheme>
-      <scheme>lsm_noah</scheme>
-      <scheme>sfc_sice</scheme>
-      <scheme>GFS_surface_loop_control_part2</scheme>
-    </subcycle>
-    <!-- End of surface iteration loop -->
-    <subcycle loop="1">
-      <scheme>GFS_surface_composites_post</scheme>
-      <scheme>sfc_diag</scheme>
-      <scheme>sfc_diag_post</scheme>
-      <scheme>GFS_surface_generic_post</scheme>
-      <scheme>GFS_PBL_generic_pre</scheme>
-      <scheme>satmedmfvdifq</scheme>
-      <scheme>GFS_PBL_generic_post</scheme>
-      <scheme>GFS_GWD_generic_pre</scheme>
-      <scheme>cires_ugwp</scheme>
-      <scheme>cires_ugwp_post</scheme>
-      <scheme>GFS_GWD_generic_post</scheme>
-      <scheme>rayleigh_damp</scheme>
-      <scheme>GFS_suite_stateout_update</scheme>
-      <scheme>ozphys</scheme>
-      <scheme>get_phi_fv3</scheme>
-      <scheme>GFS_suite_interstitial_3</scheme>
-      <scheme>GFS_DCNV_generic_pre</scheme>
-      <scheme>samfdeepcnv</scheme>
-      <scheme>GFS_DCNV_generic_post</scheme>
-      <scheme>GFS_SCNV_generic_pre</scheme>
-      <scheme>samfshalcnv</scheme>
-      <scheme>GFS_SCNV_generic_post</scheme>
-      <scheme>GFS_suite_interstitial_4</scheme>
-      <scheme>cnvc90</scheme>
-      <scheme>GFS_MP_generic_pre</scheme>
-      <scheme>zhaocarr_gscond</scheme>
-      <scheme>zhaocarr_precpd</scheme>
-      <scheme>GFS_MP_generic_post</scheme>
-      <scheme>maximum_hourly_diagnostics</scheme>
-      <scheme>phys_tend</scheme>
-    </subcycle>
-  </group>
-  <group name="stochastics">
-    <subcycle loop="1">
-      <scheme>GFS_stochastics</scheme>
-    </subcycle>
-  </group>
-  <!-- <finalize></finalize> -->
-</suite>
diff --git a/ccpp/suites/suite_FV3_GFS_rasmgshoc.xml b/ccpp/suites/suite_FV3_GFS_rasmgshoc.xml
deleted file mode 100644
index f81376bc1..000000000
--- a/ccpp/suites/suite_FV3_GFS_rasmgshoc.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="FV3_GFS_rasmgshoc" version="1">
-  <!-- <init></init> -->
-  <group name="time_vary">
-    <subcycle loop="1">
-      <scheme>GFS_time_vary_pre</scheme>
-      <scheme>GFS_rrtmg_setup</scheme>
-      <scheme>GFS_rad_time_vary</scheme>
-      <scheme>GFS_phys_time_vary</scheme>
-    </subcycle>
-  </group>
-  <group name="radiation">
-    <subcycle loop="1">
-      <scheme>GFS_suite_interstitial_rad_reset</scheme>
-      <scheme>GFS_rrtmg_pre</scheme>
-      <scheme>GFS_radiation_surface</scheme>
-      <scheme>rrtmg_sw_pre</scheme>
-      <scheme>rrtmg_sw</scheme>
-      <scheme>rrtmg_sw_post</scheme>
-      <scheme>rrtmg_lw_pre</scheme>
-      <scheme>rrtmg_lw</scheme>
-      <scheme>rrtmg_lw_post</scheme>
-      <scheme>GFS_rrtmg_post</scheme>
-    </subcycle>
-  </group>
-  <group name="physics">
-    <subcycle loop="1">
-      <scheme>GFS_suite_interstitial_phys_reset</scheme>
-      <scheme>GFS_suite_stateout_reset</scheme>
-      <scheme>get_prs_fv3</scheme>
-      <scheme>GFS_suite_interstitial_1</scheme>
-      <scheme>GFS_surface_generic_pre</scheme>
-      <scheme>GFS_surface_composites_pre</scheme>
-      <scheme>dcyc2t3</scheme>
-      <scheme>GFS_surface_composites_inter</scheme>
-      <scheme>GFS_suite_interstitial_2</scheme>
-    </subcycle>
-    <!-- Surface iteration loop -->
-    <subcycle loop="2">
-      <scheme>sfc_diff</scheme>
-      <scheme>GFS_surface_loop_control_part1</scheme>
-      <scheme>sfc_nst_pre</scheme>
-      <scheme>sfc_nst</scheme>
-      <scheme>sfc_nst_post</scheme>
-      <scheme>lsm_noah</scheme>
-      <scheme>sfc_sice</scheme>
-      <scheme>GFS_surface_loop_control_part2</scheme>
-    </subcycle>
-    <!-- End of surface iteration loop -->
-    <subcycle loop="1">
-      <scheme>GFS_surface_composites_post</scheme>
-      <scheme>sfc_diag</scheme>
-      <scheme>sfc_diag_post</scheme>
-      <scheme>GFS_surface_generic_post</scheme>
-      <scheme>GFS_PBL_generic_pre</scheme>
-      <scheme>moninshoc</scheme>
-      <scheme>GFS_PBL_generic_post</scheme>
-      <scheme>GFS_GWD_generic_pre</scheme>
-      <scheme>cires_ugwp</scheme>
-      <scheme>cires_ugwp_post</scheme>
-      <scheme>GFS_GWD_generic_post</scheme>
-      <scheme>GFS_suite_stateout_update</scheme>
-      <scheme>ozphys_2015</scheme>
-      <scheme>h2ophys</scheme>
-      <scheme>get_phi_fv3</scheme>
-      <scheme>GFS_suite_interstitial_3</scheme>
-      <scheme>shoc</scheme>
-      <scheme>GFS_DCNV_generic_pre</scheme>
-      <scheme>GFS_suite_interstitial_5</scheme>
-      <scheme>rascnv</scheme>
-      <scheme>GFS_DCNV_generic_post</scheme>
-      <scheme>gwdc_pre</scheme>
-      <scheme>gwdc</scheme>
-      <scheme>gwdc_post</scheme>
-      <scheme>GFS_suite_interstitial_4</scheme>
-      <scheme>cnvc90</scheme>
-      <scheme>GFS_MP_generic_pre</scheme>
-      <scheme>m_micro_pre</scheme>
-      <scheme>m_micro</scheme>
-      <scheme>m_micro_post</scheme>
-      <scheme>GFS_MP_generic_post</scheme>
-      <scheme>maximum_hourly_diagnostics</scheme>
-      <scheme>phys_tend</scheme>
-    </subcycle>
-  </group>
-  <group name="stochastics">
-    <subcycle loop="1">
-      <scheme>GFS_stochastics</scheme>
-    </subcycle>
-  </group>
-  <!-- <finalize></finalize> -->
-</suite>
diff --git a/ccpp/suites/suite_FV3_GFS_v15_thompson.xml b/ccpp/suites/suite_FV3_GFS_v15_thompson.xml
deleted file mode 100644
index 152b87cf1..000000000
--- a/ccpp/suites/suite_FV3_GFS_v15_thompson.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="FV3_GFS_v15_thompson" version="1">
-  <!-- <init></init> -->
-  <group name="time_vary">
-    <subcycle loop="1">
-      <scheme>GFS_time_vary_pre</scheme>
-      <scheme>GFS_rrtmg_setup</scheme>
-      <scheme>GFS_rad_time_vary</scheme>
-      <scheme>GFS_phys_time_vary</scheme>
-    </subcycle>
-  </group>
-  <group name="radiation">
-    <subcycle loop="1">
-      <scheme>GFS_suite_interstitial_rad_reset</scheme>
-      <scheme>GFS_rrtmg_pre</scheme>
-      <scheme>GFS_radiation_surface</scheme>
-      <scheme>rrtmg_sw_pre</scheme>
-      <scheme>rrtmg_sw</scheme>
-      <scheme>rrtmg_sw_post</scheme>
-      <scheme>rrtmg_lw_pre</scheme>
-      <scheme>rrtmg_lw</scheme>
-      <scheme>rrtmg_lw_post</scheme>
-      <scheme>GFS_rrtmg_post</scheme>
-    </subcycle>
-  </group>
-  <group name="physics">
-    <subcycle loop="1">
-      <scheme>GFS_suite_interstitial_phys_reset</scheme>
-      <scheme>GFS_suite_stateout_reset</scheme>
-      <scheme>get_prs_fv3</scheme>
-      <scheme>GFS_suite_interstitial_1</scheme>
-      <scheme>GFS_surface_generic_pre</scheme>
-      <scheme>GFS_surface_composites_pre</scheme>
-      <scheme>dcyc2t3</scheme>
-      <scheme>GFS_surface_composites_inter</scheme>
-      <scheme>GFS_suite_interstitial_2</scheme>
-    </subcycle>
-    <!-- Surface iteration loop -->
-    <subcycle loop="2">
-      <scheme>sfc_diff</scheme>
-      <scheme>GFS_surface_loop_control_part1</scheme>
-      <scheme>sfc_nst_pre</scheme>
-      <scheme>sfc_nst</scheme>
-      <scheme>sfc_nst_post</scheme>
-      <scheme>lsm_noah</scheme>
-      <scheme>sfc_sice</scheme>
-      <scheme>GFS_surface_loop_control_part2</scheme>
-    </subcycle>
-    <!-- End of surface iteration loop -->
-    <subcycle loop="1">
-      <scheme>GFS_surface_composites_post</scheme>
-      <scheme>sfc_diag</scheme>
-      <scheme>sfc_diag_post</scheme>
-      <scheme>GFS_surface_generic_post</scheme>
-      <scheme>GFS_PBL_generic_pre</scheme>
-      <scheme>hedmf</scheme>
-      <scheme>GFS_PBL_generic_post</scheme>
-      <scheme>GFS_GWD_generic_pre</scheme>
-      <scheme>cires_ugwp</scheme>
-      <scheme>cires_ugwp_post</scheme>
-      <scheme>GFS_GWD_generic_post</scheme>
-      <scheme>rayleigh_damp</scheme>
-      <scheme>GFS_suite_stateout_update</scheme>
-      <scheme>ozphys_2015</scheme>
-      <scheme>h2ophys</scheme>
-      <scheme>get_phi_fv3</scheme>
-      <scheme>GFS_suite_interstitial_3</scheme>
-      <scheme>GFS_DCNV_generic_pre</scheme>
-      <scheme>samfdeepcnv</scheme>
-      <scheme>GFS_DCNV_generic_post</scheme>
-      <scheme>GFS_SCNV_generic_pre</scheme>
-      <scheme>samfshalcnv</scheme>
-      <scheme>GFS_SCNV_generic_post</scheme>
-      <scheme>GFS_suite_interstitial_4</scheme>
-      <scheme>cnvc90</scheme>
-      <scheme>GFS_MP_generic_pre</scheme>
-      <scheme>mp_thompson_pre</scheme>
-      <scheme>mp_thompson</scheme>
-      <scheme>mp_thompson_post</scheme>
-      <scheme>GFS_MP_generic_post</scheme>
-      <scheme>maximum_hourly_diagnostics</scheme>
-      <scheme>phys_tend</scheme>
-    </subcycle>
-  </group>
-  <group name="stochastics">
-    <subcycle loop="1">
-      <scheme>GFS_stochastics</scheme>
-    </subcycle>
-  </group>
-  <!-- <finalize></finalize> -->
-</suite>
diff --git a/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_lam3km.xml b/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_lam3km.xml
deleted file mode 100644
index c528363d7..000000000
--- a/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_lam3km.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="FV3_GFS_v15_thompson_mynn_lam3km" version="1">
-  <!-- <init></init> -->
-  <group name="time_vary">
-    <subcycle loop="1">
-      <scheme>GFS_time_vary_pre</scheme>
-      <scheme>GFS_rrtmg_setup</scheme>
-      <scheme>GFS_rad_time_vary</scheme>
-      <scheme>GFS_phys_time_vary</scheme>
-    </subcycle>
-  </group>
-  <group name="radiation">
-    <subcycle loop="1">
-      <scheme>GFS_suite_interstitial_rad_reset</scheme>
-      <scheme>sgscloud_radpre</scheme>
-      <scheme>GFS_rrtmg_pre</scheme>
-      <scheme>GFS_radiation_surface</scheme>
-      <scheme>rrtmg_sw_pre</scheme>
-      <scheme>rrtmg_sw</scheme>
-      <scheme>rrtmg_sw_post</scheme>
-      <scheme>rrtmg_lw_pre</scheme>
-      <scheme>rrtmg_lw</scheme>
-      <scheme>sgscloud_radpost</scheme>
-      <scheme>rrtmg_lw_post</scheme>
-      <scheme>GFS_rrtmg_post</scheme>
-    </subcycle>
-  </group>
-  <group name="physics">
-    <subcycle loop="1">
-      <scheme>GFS_suite_interstitial_phys_reset</scheme>
-      <scheme>GFS_suite_stateout_reset</scheme>
-      <scheme>get_prs_fv3</scheme>
-      <scheme>GFS_suite_interstitial_1</scheme>
-      <scheme>GFS_surface_generic_pre</scheme>
-      <scheme>GFS_surface_composites_pre</scheme>
-      <scheme>dcyc2t3</scheme>
-      <scheme>GFS_surface_composites_inter</scheme>
-      <scheme>GFS_suite_interstitial_2</scheme>
-    </subcycle>
-    <!-- Surface iteration loop -->
-    <subcycle loop="2">
-      <scheme>mynnsfc_wrapper</scheme>
-      <scheme>GFS_surface_loop_control_part1</scheme>
-      <scheme>sfc_nst_pre</scheme>
-      <scheme>sfc_nst</scheme>
-      <scheme>sfc_nst_post</scheme>
-      <scheme>lsm_noah</scheme>
-      <scheme>sfc_sice</scheme>
-      <scheme>GFS_surface_loop_control_part2</scheme>
-    </subcycle>
-    <!-- End of surface iteration loop -->
-    <subcycle loop="1">
-      <scheme>GFS_surface_composites_post</scheme>
-      <scheme>sfc_diag</scheme>
-      <scheme>sfc_diag_post</scheme>
-      <scheme>GFS_surface_generic_post</scheme>
-      <scheme>mynnedmf_wrapper</scheme>
-      <scheme>GFS_GWD_generic_pre</scheme>
-      <scheme>cires_ugwp_post</scheme>
-      <scheme>GFS_GWD_generic_post</scheme>
-      <scheme>rayleigh_damp</scheme>
-      <scheme>GFS_suite_stateout_update</scheme>
-      <scheme>ozphys_2015</scheme>
-      <scheme>h2ophys</scheme>
-      <scheme>get_phi_fv3</scheme>
-      <scheme>GFS_suite_interstitial_3</scheme>
-      <scheme>GFS_suite_interstitial_4</scheme>
-      <scheme>GFS_MP_generic_pre</scheme>
-      <scheme>mp_thompson_pre</scheme>
-      <scheme>mp_thompson</scheme>
-      <scheme>mp_thompson_post</scheme>
-      <scheme>GFS_MP_generic_post</scheme>
-      <scheme>maximum_hourly_diagnostics</scheme>
-      <scheme>phys_tend</scheme>
-    </subcycle>
-  </group>
-  <group name="stochastics">
-    <subcycle loop="1">
-      <scheme>GFS_stochastics</scheme>
-    </subcycle>
-  </group>
-  <!-- <finalize></finalize> -->
-</suite>
diff --git a/ccpp/suites/suite_FV3_GFS_v15p2.xml b/ccpp/suites/suite_FV3_GFS_v15p2.xml
deleted file mode 100644
index aa9a38f00..000000000
--- a/ccpp/suites/suite_FV3_GFS_v15p2.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="FV3_GFS_v15p2" version="1">
-  <!-- <init></init> -->
-  <group name="fast_physics">
-    <subcycle loop="1">
-      <scheme>fv_sat_adj</scheme>
-    </subcycle>
-  </group>
-  <group name="time_vary">
-    <subcycle loop="1">
-      <scheme>GFS_time_vary_pre</scheme>
-      <scheme>GFS_rrtmg_setup</scheme>
-      <scheme>GFS_rad_time_vary</scheme>
-      <scheme>GFS_phys_time_vary</scheme>
-    </subcycle>
-  </group>
-  <group name="radiation">
-    <subcycle loop="1">
-      <scheme>GFS_suite_interstitial_rad_reset</scheme>
-      <scheme>GFS_rrtmg_pre</scheme>
-      <scheme>GFS_radiation_surface</scheme>
-      <scheme>rrtmg_sw_pre</scheme>
-      <scheme>rrtmg_sw</scheme>
-      <scheme>rrtmg_sw_post</scheme>
-      <scheme>rrtmg_lw_pre</scheme>
-      <scheme>rrtmg_lw</scheme>
-      <scheme>rrtmg_lw_post</scheme>
-      <scheme>GFS_rrtmg_post</scheme>
-    </subcycle>
-  </group>
-  <group name="physics">
-    <subcycle loop="1">
-      <scheme>GFS_suite_interstitial_phys_reset</scheme>
-      <scheme>GFS_suite_stateout_reset</scheme>
-      <scheme>get_prs_fv3</scheme>
-      <scheme>GFS_suite_interstitial_1</scheme>
-      <scheme>GFS_surface_generic_pre</scheme>
-      <scheme>GFS_surface_composites_pre</scheme>
-      <scheme>dcyc2t3</scheme>
-      <scheme>GFS_surface_composites_inter</scheme>
-      <scheme>GFS_suite_interstitial_2</scheme>
-    </subcycle>
-    <!-- Surface iteration loop -->
-    <subcycle loop="2">
-      <scheme>sfc_diff</scheme>
-      <scheme>GFS_surface_loop_control_part1</scheme>
-      <scheme>sfc_nst_pre</scheme>
-      <scheme>sfc_nst</scheme>
-      <scheme>sfc_nst_post</scheme>
-      <scheme>lsm_noah</scheme>
-      <scheme>sfc_sice</scheme>
-      <scheme>GFS_surface_loop_control_part2</scheme>
-    </subcycle>
-    <!-- End of surface iteration loop -->
-    <subcycle loop="1">
-      <scheme>GFS_surface_composites_post</scheme>
-      <scheme>sfc_diag</scheme>
-      <scheme>sfc_diag_post</scheme>
-      <scheme>GFS_surface_generic_post</scheme>
-      <scheme>GFS_PBL_generic_pre</scheme>
-      <scheme>hedmf</scheme>
-      <scheme>GFS_PBL_generic_post</scheme>
-      <scheme>GFS_GWD_generic_pre</scheme>
-      <scheme>cires_ugwp</scheme>
-      <scheme>cires_ugwp_post</scheme>
-      <scheme>GFS_GWD_generic_post</scheme>
-      <scheme>rayleigh_damp</scheme>
-      <scheme>GFS_suite_stateout_update</scheme>
-      <scheme>ozphys_2015</scheme>
-      <scheme>h2ophys</scheme>
-      <scheme>get_phi_fv3</scheme>
-      <scheme>GFS_suite_interstitial_3</scheme>
-      <scheme>GFS_DCNV_generic_pre</scheme>
-      <scheme>samfdeepcnv</scheme>
-      <scheme>GFS_DCNV_generic_post</scheme>
-      <scheme>GFS_SCNV_generic_pre</scheme>
-      <scheme>samfshalcnv</scheme>
-      <scheme>GFS_SCNV_generic_post</scheme>
-      <scheme>GFS_suite_interstitial_4</scheme>
-      <scheme>cnvc90</scheme>
-      <scheme>GFS_MP_generic_pre</scheme>
-      <scheme>gfdl_cloud_microphys</scheme>
-      <scheme>GFS_MP_generic_post</scheme>
-      <scheme>maximum_hourly_diagnostics</scheme>
-      <scheme>phys_tend</scheme>
-    </subcycle>
-  </group>
-  <group name="stochastics">
-    <subcycle loop="1">
-      <scheme>GFS_stochastics</scheme>
-    </subcycle>
-  </group>
-  <!-- <finalize></finalize> -->
-</suite>
diff --git a/ccpp/suites/suite_FV3_GFS_v15p2_RRTMGP.xml b/ccpp/suites/suite_FV3_GFS_v15p2_RRTMGP.xml
deleted file mode 100644
index 916111c2b..000000000
--- a/ccpp/suites/suite_FV3_GFS_v15p2_RRTMGP.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="FV3_GFS_v15p2_RRTMGP" version="1">
-  <!-- <init></init> -->
-  <group name="fast_physics">
-    <subcycle loop="1">
-      <scheme>fv_sat_adj</scheme>
-    </subcycle>
-  </group>
-  <group name="time_vary">
-    <subcycle loop="1">
-      <scheme>GFS_time_vary_pre</scheme>
-      <scheme>GFS_rrtmgp_setup</scheme>
-      <scheme>GFS_rad_time_vary</scheme>
-      <scheme>GFS_phys_time_vary</scheme>
-    </subcycle>
-  </group>
-  <group name="radiation">
-    <subcycle loop="1">
-      <scheme>GFS_suite_interstitial_rad_reset</scheme>
-      <scheme>GFS_rrtmgp_pre</scheme>
-      <scheme>GFS_radiation_surface</scheme>
-      <scheme>GFS_rrtmgp_gfdlmp_pre</scheme>
-      <scheme>GFS_rrtmgp_cloud_overlap_pre</scheme>
-      <scheme>GFS_cloud_diagnostics</scheme>
-      <scheme>GFS_rrtmgp_sw_pre</scheme>
-      <scheme>rrtmgp_sw_gas_optics</scheme>
-      <scheme>rrtmgp_sw_aerosol_optics</scheme>
-      <scheme>rrtmgp_sw_cloud_optics</scheme>
-      <scheme>rrtmgp_sw_cloud_sampling</scheme>
-      <scheme>rrtmgp_sw_rte</scheme>
-      <scheme>GFS_rrtmgp_sw_post</scheme>
-      <scheme>rrtmgp_lw_pre</scheme>
-      <scheme>rrtmgp_lw_gas_optics</scheme>
-      <scheme>rrtmgp_lw_aerosol_optics</scheme>
-      <scheme>rrtmgp_lw_cloud_optics</scheme>
-      <scheme>rrtmgp_lw_cloud_sampling</scheme>
-      <scheme>rrtmgp_lw_rte</scheme>
-      <scheme>GFS_rrtmgp_lw_post</scheme>
-    </subcycle>
-  </group>
-  <group name="physics">
-    <subcycle loop="1">
-      <scheme>GFS_suite_interstitial_phys_reset</scheme>
-      <scheme>GFS_suite_stateout_reset</scheme>
-      <scheme>get_prs_fv3</scheme>
-      <scheme>GFS_suite_interstitial_1</scheme>
-      <scheme>GFS_surface_generic_pre</scheme>
-      <scheme>GFS_surface_composites_pre</scheme>
-      <scheme>dcyc2t3</scheme>
-      <scheme>GFS_surface_composites_inter</scheme>
-      <scheme>GFS_suite_interstitial_2</scheme>
-    </subcycle>
-    <!-- Surface iteration loop -->
-    <subcycle loop="2">
-      <scheme>sfc_diff</scheme>
-      <scheme>GFS_surface_loop_control_part1</scheme>
-      <scheme>sfc_nst_pre</scheme>
-      <scheme>sfc_nst</scheme>
-      <scheme>sfc_nst_post</scheme>
-      <scheme>lsm_noah</scheme>
-      <scheme>sfc_sice</scheme>
-      <scheme>GFS_surface_loop_control_part2</scheme>
-    </subcycle>
-    <!-- End of surface iteration loop -->
-    <subcycle loop="1">
-      <scheme>GFS_surface_composites_post</scheme>
-      <scheme>sfc_diag</scheme>
-      <scheme>sfc_diag_post</scheme>
-      <scheme>GFS_surface_generic_post</scheme>
-      <scheme>GFS_PBL_generic_pre</scheme>
-      <scheme>hedmf</scheme>
-      <scheme>GFS_PBL_generic_post</scheme>
-      <scheme>GFS_GWD_generic_pre</scheme>
-      <scheme>cires_ugwp</scheme>
-      <scheme>cires_ugwp_post</scheme>
-      <scheme>GFS_GWD_generic_post</scheme>
-      <scheme>rayleigh_damp</scheme>
-      <scheme>GFS_suite_stateout_update</scheme>
-      <scheme>ozphys_2015</scheme>
-      <scheme>h2ophys</scheme>
-      <scheme>get_phi_fv3</scheme>
-      <scheme>GFS_suite_interstitial_3</scheme>
-      <scheme>GFS_DCNV_generic_pre</scheme>
-      <scheme>samfdeepcnv</scheme>
-      <scheme>GFS_DCNV_generic_post</scheme>
-      <scheme>GFS_SCNV_generic_pre</scheme>
-      <scheme>samfshalcnv</scheme>
-      <scheme>GFS_SCNV_generic_post</scheme>
-      <scheme>GFS_suite_interstitial_4</scheme>
-      <scheme>cnvc90</scheme>
-      <scheme>GFS_MP_generic_pre</scheme>
-      <scheme>gfdl_cloud_microphys</scheme>
-      <scheme>GFS_MP_generic_post</scheme>
-      <scheme>maximum_hourly_diagnostics</scheme>
-      <scheme>phys_tend</scheme>
-    </subcycle>
-  </group>
-  <group name="stochastics">
-    <subcycle loop="1">
-      <scheme>GFS_stochastics</scheme>
-    </subcycle>
-  </group>
-  <!-- <finalize></finalize> -->
-</suite>
diff --git a/ccpp/suites/suite_FV3_GFS_v15p2_no_nsst.xml b/ccpp/suites/suite_FV3_GFS_v15p2_no_nsst.xml
deleted file mode 100644
index 8ba6e524a..000000000
--- a/ccpp/suites/suite_FV3_GFS_v15p2_no_nsst.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="FV3_GFS_v15p2_no_nsst" version="1">
-  <!-- <init></init> -->
-  <group name="fast_physics">
-    <subcycle loop="1">
-      <scheme>fv_sat_adj</scheme>
-    </subcycle>
-  </group>
-  <group name="time_vary">
-    <subcycle loop="1">
-      <scheme>GFS_time_vary_pre</scheme>
-      <scheme>GFS_rrtmg_setup</scheme>
-      <scheme>GFS_rad_time_vary</scheme>
-      <scheme>GFS_phys_time_vary</scheme>
-    </subcycle>
-  </group>
-  <group name="radiation">
-    <subcycle loop="1">
-      <scheme>GFS_suite_interstitial_rad_reset</scheme>
-      <scheme>GFS_rrtmg_pre</scheme>
-      <scheme>GFS_radiation_surface</scheme>
-      <scheme>rrtmg_sw_pre</scheme>
-      <scheme>rrtmg_sw</scheme>
-      <scheme>rrtmg_sw_post</scheme>
-      <scheme>rrtmg_lw_pre</scheme>
-      <scheme>rrtmg_lw</scheme>
-      <scheme>rrtmg_lw_post</scheme>
-      <scheme>GFS_rrtmg_post</scheme>
-    </subcycle>
-  </group>
-  <group name="physics">
-    <subcycle loop="1">
-      <scheme>GFS_suite_interstitial_phys_reset</scheme>
-      <scheme>GFS_suite_stateout_reset</scheme>
-      <scheme>get_prs_fv3</scheme>
-      <scheme>GFS_suite_interstitial_1</scheme>
-      <scheme>GFS_surface_generic_pre</scheme>
-      <scheme>GFS_surface_composites_pre</scheme>
-      <scheme>dcyc2t3</scheme>
-      <scheme>GFS_surface_composites_inter</scheme>
-      <scheme>GFS_suite_interstitial_2</scheme>
-    </subcycle>
-    <!-- Surface iteration loop -->
-    <subcycle loop="2">
-      <scheme>sfc_diff</scheme>
-      <scheme>GFS_surface_loop_control_part1</scheme>
-      <scheme>sfc_ocean</scheme>
-      <scheme>lsm_noah</scheme>
-      <scheme>sfc_sice</scheme>
-      <scheme>GFS_surface_loop_control_part2</scheme>
-    </subcycle>
-    <!-- End of surface iteration loop -->
-    <subcycle loop="1">
-      <scheme>GFS_surface_composites_post</scheme>
-      <scheme>sfc_diag</scheme>
-      <scheme>sfc_diag_post</scheme>
-      <scheme>GFS_surface_generic_post</scheme>
-      <scheme>GFS_PBL_generic_pre</scheme>
-      <scheme>hedmf</scheme>
-      <scheme>GFS_PBL_generic_post</scheme>
-      <scheme>GFS_GWD_generic_pre</scheme>
-      <scheme>cires_ugwp</scheme>
-      <scheme>cires_ugwp_post</scheme>
-      <scheme>GFS_GWD_generic_post</scheme>
-      <scheme>rayleigh_damp</scheme>
-      <scheme>GFS_suite_stateout_update</scheme>
-      <scheme>ozphys_2015</scheme>
-      <scheme>h2ophys</scheme>
-      <scheme>get_phi_fv3</scheme>
-      <scheme>GFS_suite_interstitial_3</scheme>
-      <scheme>GFS_DCNV_generic_pre</scheme>
-      <scheme>samfdeepcnv</scheme>
-      <scheme>GFS_DCNV_generic_post</scheme>
-      <scheme>GFS_SCNV_generic_pre</scheme>
-      <scheme>samfshalcnv</scheme>
-      <scheme>GFS_SCNV_generic_post</scheme>
-      <scheme>GFS_suite_interstitial_4</scheme>
-      <scheme>cnvc90</scheme>
-      <scheme>GFS_MP_generic_pre</scheme>
-      <scheme>gfdl_cloud_microphys</scheme>
-      <scheme>GFS_MP_generic_post</scheme>
-      <scheme>maximum_hourly_diagnostics</scheme>
-      <scheme>phys_tend</scheme>
-    </subcycle>
-  </group>
-  <group name="stochastics">
-    <subcycle loop="1">
-      <scheme>GFS_stochastics</scheme>
-    </subcycle>
-  </group>
-  <!-- <finalize></finalize> -->
-</suite>
diff --git a/ccpp/suites/suite_FV3_GFS_v15plus.xml b/ccpp/suites/suite_FV3_GFS_v15plus.xml
deleted file mode 100644
index ce691bbc7..000000000
--- a/ccpp/suites/suite_FV3_GFS_v15plus.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="FV3_GFS_v15plus" version="1">
-  <!-- <init></init> -->
-  <group name="fast_physics">
-    <subcycle loop="1">
-      <scheme>fv_sat_adj</scheme>
-    </subcycle>
-  </group>
-  <group name="time_vary">
-    <subcycle loop="1">
-      <scheme>GFS_time_vary_pre</scheme>
-      <scheme>GFS_rrtmg_setup</scheme>
-      <scheme>GFS_rad_time_vary</scheme>
-      <scheme>GFS_phys_time_vary</scheme>
-    </subcycle>
-  </group>
-  <group name="radiation">
-    <subcycle loop="1">
-      <scheme>GFS_suite_interstitial_rad_reset</scheme>
-      <scheme>GFS_rrtmg_pre</scheme>
-      <scheme>GFS_radiation_surface</scheme>
-      <scheme>rrtmg_sw_pre</scheme>
-      <scheme>rrtmg_sw</scheme>
-      <scheme>rrtmg_sw_post</scheme>
-      <scheme>rrtmg_lw_pre</scheme>
-      <scheme>rrtmg_lw</scheme>
-      <scheme>rrtmg_lw_post</scheme>
-      <scheme>GFS_rrtmg_post</scheme>
-    </subcycle>
-  </group>
-  <group name="physics">
-    <subcycle loop="1">
-      <scheme>GFS_suite_interstitial_phys_reset</scheme>
-      <scheme>GFS_suite_stateout_reset</scheme>
-      <scheme>get_prs_fv3</scheme>
-      <scheme>GFS_suite_interstitial_1</scheme>
-      <scheme>GFS_surface_generic_pre</scheme>
-      <scheme>GFS_surface_composites_pre</scheme>
-      <scheme>dcyc2t3</scheme>
-      <scheme>GFS_surface_composites_inter</scheme>
-      <scheme>GFS_suite_interstitial_2</scheme>
-    </subcycle>
-    <!-- Surface iteration loop -->
-    <subcycle loop="2">
-      <scheme>sfc_diff</scheme>
-      <scheme>GFS_surface_loop_control_part1</scheme>
-      <scheme>sfc_nst_pre</scheme>
-      <scheme>sfc_nst</scheme>
-      <scheme>sfc_nst_post</scheme>
-      <scheme>lsm_noah</scheme>
-      <scheme>sfc_sice</scheme>
-      <scheme>GFS_surface_loop_control_part2</scheme>
-    </subcycle>
-    <!-- End of surface iteration loop -->
-    <subcycle loop="1">
-      <scheme>GFS_surface_composites_post</scheme>
-      <scheme>sfc_diag</scheme>
-      <scheme>sfc_diag_post</scheme>
-      <scheme>GFS_surface_generic_post</scheme>
-      <scheme>GFS_PBL_generic_pre</scheme>
-      <scheme>satmedmfvdif</scheme>
-      <scheme>GFS_PBL_generic_post</scheme>
-      <scheme>GFS_GWD_generic_pre</scheme>
-      <scheme>cires_ugwp</scheme>
-      <scheme>cires_ugwp_post</scheme>
-      <scheme>GFS_GWD_generic_post</scheme>
-      <scheme>rayleigh_damp</scheme>
-      <scheme>GFS_suite_stateout_update</scheme>
-      <scheme>ozphys_2015</scheme>
-      <scheme>h2ophys</scheme>
-      <scheme>get_phi_fv3</scheme>
-      <scheme>GFS_suite_interstitial_3</scheme>
-      <scheme>GFS_DCNV_generic_pre</scheme>
-      <scheme>samfdeepcnv</scheme>
-      <scheme>GFS_DCNV_generic_post</scheme>
-      <scheme>GFS_SCNV_generic_pre</scheme>
-      <scheme>samfshalcnv</scheme>
-      <scheme>GFS_SCNV_generic_post</scheme>
-      <scheme>GFS_suite_interstitial_4</scheme>
-      <scheme>cnvc90</scheme>
-      <scheme>GFS_MP_generic_pre</scheme>
-      <scheme>gfdl_cloud_microphys</scheme>
-      <scheme>GFS_MP_generic_post</scheme>
-      <scheme>maximum_hourly_diagnostics</scheme>
-      <scheme>phys_tend</scheme>
-    </subcycle>
-  </group>
-  <group name="stochastics">
-    <subcycle loop="1">
-      <scheme>GFS_stochastics</scheme>
-    </subcycle>
-  </group>
-  <!-- <finalize></finalize> -->
-</suite>