diff --git a/ccpp/physics b/ccpp/physics
index aae0d5f28..9a3846dca 160000
--- a/ccpp/physics
+++ b/ccpp/physics
@@ -1 +1 @@
-Subproject commit aae0d5f281f4f9f41fa8287ac326823a9910207f
+Subproject commit 9a3846dca98d558432219f8f9919c9d1768969a7
diff --git a/ccpp/suites/suite_FV3_HAFS_v0_hwrf_thompson.xml b/ccpp/suites/suite_FV3_HAFS_v0_hwrf_thompson.xml
deleted file mode 100644
index 2bc2f8592..000000000
--- a/ccpp/suites/suite_FV3_HAFS_v0_hwrf_thompson.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="FV3_HAFS_v0_hwrf_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>sgscloud_radpre</scheme> -->
-      <scheme>GFS_rrtmg_pre</scheme>
-      <scheme>GFS_radiation_surface</scheme>
-      <scheme>rrtmg_lw_pre</scheme>
-      <scheme>rrtmg_lw</scheme>
-      <scheme>rrtmg_lw_post</scheme>
-      <scheme>rrtmg_sw_pre</scheme>
-      <scheme>rrtmg_sw</scheme>
-      <scheme>rrtmg_sw_post</scheme>
-      <scheme>GFS_rrtmg_post</scheme>
-      <!-- <scheme>sgscloud_radpost</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>gfdl_sfc_layer</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>GFS_suite_stateout_update</scheme>
-      <scheme>ozphys_2015</scheme>
-      <scheme>h2ophys</scheme>
-      <scheme>GFS_DCNV_generic_pre</scheme>
-      <scheme>get_phi_fv3</scheme>
-      <scheme>GFS_suite_interstitial_3</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>