diff --git a/cime_config/config_pes.xml b/cime_config/config_pes.xml
index ec4c54444..84de1207a 100644
--- a/cime_config/config_pes.xml
+++ b/cime_config/config_pes.xml
@@ -110,7 +110,7 @@
     </mach>
   </grid>
   <grid name="a%ne30" >
-    <mach name="hobart">
+    <mach name="hobart|izumi">
       <pes pesize="any" compset="any">
 	<comment>none</comment>
 	<ntasks>
@@ -360,116 +360,7 @@
       </pes>
     </mach>
   </grid>
-  <grid name="a%ne16" >
-    <mach name="yellowstone|pronghorn">
-      <pes pesize="any" compset="any">
-        <MAX_MPITASKS_PER_NODE>16</MAX_MPITASKS_PER_NODE>
-        <MAX_TASKS_PER_NODE>32</MAX_TASKS_PER_NODE>
-	<comment>none</comment>
-	<ntasks>
-	  <ntasks_atm>630</ntasks_atm> 
-	  <ntasks_lnd>630</ntasks_lnd>           
-	  <ntasks_rof>630</ntasks_rof> 
-	  <ntasks_ice>630</ntasks_ice> 
-	  <ntasks_ocn>630</ntasks_ocn> 
-	  <ntasks_glc>630</ntasks_glc> 
-	  <ntasks_wav>630</ntasks_wav> 
-	  <ntasks_cpl>630</ntasks_cpl> 
-	</ntasks>
-	<nthrds>
-	  <nthrds_atm>2</nthrds_atm>   
-	  <nthrds_lnd>2</nthrds_lnd> 
-	  <nthrds_rof>2</nthrds_rof> 
-	  <nthrds_ice>2</nthrds_ice> 
-	  <nthrds_ocn>2</nthrds_ocn> 
-	  <nthrds_glc>2</nthrds_glc> 
-	  <nthrds_wav>2</nthrds_wav> 
-	  <nthrds_cpl>2</nthrds_cpl> 
-	</nthrds>
-	<rootpe>
-	  <rootpe_atm>0</rootpe_atm> 
-	  <rootpe_lnd>0</rootpe_lnd> 
-	  <rootpe_rof>0</rootpe_rof> 
-	  <rootpe_ice>0</rootpe_ice>    
-	  <rootpe_ocn>0</rootpe_ocn>   
-	  <rootpe_glc>0</rootpe_glc> 
-	  <rootpe_wav>0</rootpe_wav> 
-	  <rootpe_cpl>0</rootpe_cpl>                         
-	</rootpe>
-      </pes>
-    </mach>
-  </grid>
   <grid name="a%ne30" >
-    <mach name="yellowstone|pronghorn">
-      <pes pesize="any" compset="any">
-        <MAX_MPITASKS_PER_NODE>16</MAX_MPITASKS_PER_NODE>
-        <MAX_TASKS_PER_NODE>32</MAX_TASKS_PER_NODE>
-	<comment>none</comment>
-	<ntasks>
-	  <ntasks_atm>900</ntasks_atm> 
-	  <ntasks_lnd>900</ntasks_lnd>           
-	  <ntasks_rof>900</ntasks_rof> 
-	  <ntasks_ice>900</ntasks_ice> 
-	  <ntasks_ocn>900</ntasks_ocn> 
-	  <ntasks_glc>900</ntasks_glc> 
-	  <ntasks_wav>900</ntasks_wav> 
-	  <ntasks_cpl>900</ntasks_cpl> 
-	</ntasks>
-	<nthrds>
-	  <nthrds_atm>2</nthrds_atm>   
-	  <nthrds_lnd>2</nthrds_lnd> 
-	  <nthrds_rof>2</nthrds_rof> 
-	  <nthrds_ice>2</nthrds_ice> 
-	  <nthrds_ocn>2</nthrds_ocn> 
-	  <nthrds_glc>2</nthrds_glc> 
-	  <nthrds_wav>2</nthrds_wav> 
-	  <nthrds_cpl>2</nthrds_cpl> 
-	</nthrds>
-	<rootpe>
-	  <rootpe_atm>0</rootpe_atm> 
-	  <rootpe_lnd>0</rootpe_lnd> 
-	  <rootpe_rof>0</rootpe_rof> 
-	  <rootpe_ice>0</rootpe_ice>    
-	  <rootpe_ocn>0</rootpe_ocn>   
-	  <rootpe_glc>0</rootpe_glc> 
-	  <rootpe_wav>0</rootpe_wav> 
-	  <rootpe_cpl>0</rootpe_cpl>                         
-	</rootpe>
-      </pes>
-      <pes pesize="any" compset="CAM\d+%W">
-	<comment>none</comment>
-	<ntasks>
-	  <ntasks_atm>1800</ntasks_atm> 
-	  <ntasks_lnd>1800</ntasks_lnd>           
-	  <ntasks_rof>1800</ntasks_rof> 
-	  <ntasks_ice>1800</ntasks_ice> 
-	  <ntasks_ocn>1800</ntasks_ocn> 
-	  <ntasks_glc>1800</ntasks_glc> 
-	  <ntasks_wav>1800</ntasks_wav> 
-	  <ntasks_cpl>1800</ntasks_cpl> 
-	</ntasks>
-	<nthrds>
-	  <nthrds_atm>2</nthrds_atm>   
-	  <nthrds_lnd>2</nthrds_lnd> 
-	  <nthrds_rof>2</nthrds_rof> 
-	  <nthrds_ice>2</nthrds_ice> 
-	  <nthrds_ocn>2</nthrds_ocn> 
-	  <nthrds_glc>2</nthrds_glc> 
-	  <nthrds_wav>2</nthrds_wav> 
-	  <nthrds_cpl>2</nthrds_cpl> 
-	</nthrds>
-	<rootpe>
-	  <rootpe_atm>0</rootpe_atm> 
-	  <rootpe_lnd>0</rootpe_lnd> 
-	  <rootpe_rof>0</rootpe_rof> 
-	  <rootpe_ice>0</rootpe_ice>    
-	  <rootpe_ocn>0</rootpe_ocn>   
-	  <rootpe_glc>0</rootpe_glc> 
-	  <rootpe_wav>0</rootpe_wav> 
-	  <rootpe_cpl>0</rootpe_cpl>                         
-	</rootpe>
-      </pes>
-    </mach>
     <mach name="cheyenne">
       <pes pesize="any" compset="_(CAM50|CAM60)%(CC|WC|CV|CF)">
         <comment>none</comment>
@@ -691,45 +582,6 @@
       </pes>
     </mach>
   </grid>
-  <grid name="a%ne120">
-    <mach name="yellowstone|pronghorn">
-      <pes pesize="any" compset="any">
-        <MAX_MPITASKS_PER_NODE>16</MAX_MPITASKS_PER_NODE>
-        <MAX_TASKS_PER_NODE>32</MAX_TASKS_PER_NODE>
-	<comment>none</comment>
-	<ntasks>
-	  <ntasks_atm>7680</ntasks_atm> 
-	  <ntasks_lnd>3040</ntasks_lnd>           
-	  <ntasks_rof>3040</ntasks_rof> 
-	  <ntasks_ice>3840</ntasks_ice> 
-	  <ntasks_ocn>7680</ntasks_ocn> 
-	  <ntasks_glc>7680</ntasks_glc> 
-	  <ntasks_wav>7680</ntasks_wav> 
-	  <ntasks_cpl>7680</ntasks_cpl> 
-	</ntasks>
-	<nthrds>
-	  <nthrds_atm>2</nthrds_atm> 
-	  <nthrds_lnd>2</nthrds_lnd> 
-	  <nthrds_rof>2</nthrds_rof> 
-	  <nthrds_ice>2</nthrds_ice> 
-	  <nthrds_ocn>2</nthrds_ocn> 
-	  <nthrds_glc>2</nthrds_glc> 
-	  <nthrds_wav>2</nthrds_wav> 
-	  <nthrds_cpl>2</nthrds_cpl> 
-	</nthrds>
-	<rootpe>
-	  <rootpe_atm>0</rootpe_atm> 
-	  <rootpe_lnd>0</rootpe_lnd> 
-	  <rootpe_rof>0</rootpe_rof> 
-	  <rootpe_ice>3040</rootpe_ice>    
-	  <rootpe_ocn>0</rootpe_ocn>   
-	  <rootpe_glc>0</rootpe_glc> 
-	  <rootpe_wav>0</rootpe_wav> 
-	  <rootpe_cpl>0</rootpe_cpl>                         
-	</rootpe>
-      </pes>
-    </mach>
-  </grid>
   <grid name="a%ne240">
     <mach name="any">
       <pes pesize="any" compset="any">
@@ -767,45 +619,6 @@
       </pes>
     </mach>
   </grid>
-  <grid name="a%T31">
-    <mach name="yellowstone|pronghorn">
-      <pes pesize="any" compset="any">
-        <MAX_MPITASKS_PER_NODE>32</MAX_MPITASKS_PER_NODE>
-        <MAX_TASKS_PER_NODE>32</MAX_TASKS_PER_NODE>
-	<comment>none</comment>
-	<ntasks>
-	  <ntasks_atm>-1</ntasks_atm> 
-	  <ntasks_lnd>-1</ntasks_lnd>           
-	  <ntasks_rof>-1</ntasks_rof> 
-	  <ntasks_ice>-1</ntasks_ice> 
-	  <ntasks_ocn>-1</ntasks_ocn> 
-	  <ntasks_glc>-1</ntasks_glc> 
-	  <ntasks_wav>-1</ntasks_wav> 
-	  <ntasks_cpl>-1</ntasks_cpl> 
-	</ntasks>
-	<nthrds>
-	  <nthrds_atm>1</nthrds_atm>
-  	  <nthrds_lnd>1</nthrds_lnd> 
-	  <nthrds_rof>1</nthrds_rof> 
-	  <nthrds_ice>1</nthrds_ice> 
-	  <nthrds_ocn>1</nthrds_ocn> 
-	  <nthrds_glc>1</nthrds_glc> 
-	  <nthrds_wav>1</nthrds_wav> 
-	  <nthrds_cpl>1</nthrds_cpl> 
-	</nthrds>
-	<rootpe>
-	  <rootpe_atm>0</rootpe_atm> 
-	  <rootpe_lnd>0</rootpe_lnd> 
-	  <rootpe_rof>0</rootpe_rof> 
-	  <rootpe_ice>0</rootpe_ice>    
-	  <rootpe_ocn>0</rootpe_ocn>   
-	  <rootpe_glc>0</rootpe_glc> 
-	  <rootpe_wav>0</rootpe_wav> 
-	  <rootpe_cpl>0</rootpe_cpl>                         
-	</rootpe>
-      </pes>
-    </mach>
-  </grid>
   <grid name="a%T31">
     <mach name="edison|eos">
       <pes pesize="any" compset="any">
@@ -1209,7 +1022,7 @@
 	</rootpe>
       </pes>
     </mach>
-    <mach name="hobart">
+    <mach name="hobart|izumi">
       <pes pesize="any" compset="CAM\d+%W">
 	<comment>none</comment>
 	<ntasks>
@@ -1283,115 +1096,6 @@
     </mach>
   </grid>
 
-  <grid name="a%1.9x2.5">
-    <mach name="yellowstone|pronghorn">
-      <pes pesize="any" compset="any">
-        <MAX_MPITASKS_PER_NODE>16</MAX_MPITASKS_PER_NODE>
-        <MAX_TASKS_PER_NODE>32</MAX_TASKS_PER_NODE>
-	<comment>none</comment>
-	<ntasks>
-	  <ntasks_atm>192</ntasks_atm> 
-	  <ntasks_lnd>192</ntasks_lnd>           
-	  <ntasks_rof>192</ntasks_rof> 
-	  <ntasks_ice>192</ntasks_ice> 
-	  <ntasks_ocn>192</ntasks_ocn> 
-	  <ntasks_glc>192</ntasks_glc> 
-	  <ntasks_wav>192</ntasks_wav> 
-	  <ntasks_cpl>192</ntasks_cpl> 
-	</ntasks>
-	<nthrds>
-	  <nthrds_atm>2</nthrds_atm> 
-	  <nthrds_lnd>2</nthrds_lnd> 
-	  <nthrds_rof>2</nthrds_rof> 
-	  <nthrds_ice>2</nthrds_ice> 
-	  <nthrds_ocn>2</nthrds_ocn> 
-	  <nthrds_glc>2</nthrds_glc> 
-	  <nthrds_wav>2</nthrds_wav> 
-	  <nthrds_cpl>2</nthrds_cpl> 
-	</nthrds>
-	<rootpe>
-	  <rootpe_atm>0</rootpe_atm> 
-	  <rootpe_lnd>0</rootpe_lnd> 
-	  <rootpe_rof>0</rootpe_rof> 
-	  <rootpe_ice>0</rootpe_ice>    
-	  <rootpe_ocn>0</rootpe_ocn>   
-	  <rootpe_glc>0</rootpe_glc> 
-	  <rootpe_wav>0</rootpe_wav> 
-	  <rootpe_cpl>0</rootpe_cpl>                         
-	</rootpe>
-      </pes>
-      <pes pesize="any" compset="_CAM\d+%WC(S|T|C|M)">
-        <MAX_MPITASKS_PER_NODE>16</MAX_MPITASKS_PER_NODE>
-        <MAX_TASKS_PER_NODE>32</MAX_TASKS_PER_NODE>
-	<comment>none</comment>
-	<ntasks>
-	  <ntasks_atm>256</ntasks_atm>
-	  <ntasks_lnd>256</ntasks_lnd>
-	  <ntasks_rof>256</ntasks_rof>
-	  <ntasks_ice>256</ntasks_ice>
-	  <ntasks_ocn>256</ntasks_ocn>
-	  <ntasks_glc>256</ntasks_glc>
-	  <ntasks_wav>256</ntasks_wav>
-	  <ntasks_cpl>256</ntasks_cpl>
-	</ntasks>
-	<nthrds>
-	  <nthrds_atm>2</nthrds_atm>
-	  <nthrds_lnd>2</nthrds_lnd>
-	  <nthrds_rof>2</nthrds_rof>
-	  <nthrds_ice>2</nthrds_ice>
-	  <nthrds_ocn>2</nthrds_ocn>
-	  <nthrds_glc>2</nthrds_glc>
-	  <nthrds_wav>2</nthrds_wav>
-	  <nthrds_cpl>2</nthrds_cpl>
-	</nthrds>
-	<rootpe>
-	  <rootpe_atm>0</rootpe_atm>
-	  <rootpe_lnd>0</rootpe_lnd>
-	  <rootpe_rof>0</rootpe_rof>
-	  <rootpe_ice>0</rootpe_ice>
-	  <rootpe_ocn>0</rootpe_ocn>
-	  <rootpe_glc>0</rootpe_glc>
-	  <rootpe_wav>0</rootpe_wav>
-	  <rootpe_cpl>0</rootpe_cpl>
-	</rootpe>
-      </pes>
-      <pes pesize="any" compset="_CAM40%WX">
-        <MAX_MPITASKS_PER_NODE>16</MAX_MPITASKS_PER_NODE>
-        <MAX_TASKS_PER_NODE>32</MAX_TASKS_PER_NODE>
-	<comment>none</comment>
-	<ntasks>
-	  <ntasks_atm>128</ntasks_atm>
-	  <ntasks_lnd>128</ntasks_lnd>
-	  <ntasks_rof>128</ntasks_rof>
-	  <ntasks_ice>128</ntasks_ice>
-	  <ntasks_ocn>128</ntasks_ocn>
-	  <ntasks_glc>128</ntasks_glc>
-	  <ntasks_wav>128</ntasks_wav>
-	  <ntasks_cpl>128</ntasks_cpl>
-	</ntasks>
-	<nthrds>
-	  <nthrds_atm>2</nthrds_atm>
-	  <nthrds_lnd>2</nthrds_lnd>
-	  <nthrds_rof>2</nthrds_rof>
-	  <nthrds_ice>2</nthrds_ice>
-	  <nthrds_ocn>2</nthrds_ocn>
-	  <nthrds_glc>2</nthrds_glc>
-	  <nthrds_wav>2</nthrds_wav>
-	  <nthrds_cpl>2</nthrds_cpl>
-	</nthrds>
-	<rootpe>
-	  <rootpe_atm>0</rootpe_atm>
-	  <rootpe_lnd>0</rootpe_lnd>
-	  <rootpe_rof>0</rootpe_rof>
-	  <rootpe_ice>0</rootpe_ice>
-	  <rootpe_ocn>0</rootpe_ocn>
-	  <rootpe_glc>0</rootpe_glc>
-	  <rootpe_wav>0</rootpe_wav>
-	  <rootpe_cpl>0</rootpe_cpl>
-	</rootpe>
-      </pes>
-    </mach>
-  </grid>
   <grid name="a%0.9x1.25">
     <mach name="any">
       <pes pesize="any" compset="any">
@@ -1503,43 +1207,6 @@
       </pes>
     </mach>
   </grid>
-  <grid name="a%0.9x1.25">
-    <mach name="yellowstone">
-      <pes pesize="any" compset="any">
-	<comment>none</comment>
-	<ntasks>
-	  <ntasks_atm>-64</ntasks_atm> 
-	  <ntasks_lnd>-64</ntasks_lnd>           
-	  <ntasks_rof>-64</ntasks_rof> 
-	  <ntasks_ice>-64</ntasks_ice> 
-	  <ntasks_ocn>-64</ntasks_ocn> 
-	  <ntasks_glc>-64</ntasks_glc> 
-	  <ntasks_wav>-64</ntasks_wav> 
-	  <ntasks_cpl>-64</ntasks_cpl> 
-	</ntasks>
-	<nthrds>
-	  <nthrds_atm>2</nthrds_atm> 
-	  <nthrds_lnd>2</nthrds_lnd> 
-	  <nthrds_rof>2</nthrds_rof> 
-	  <nthrds_ice>2</nthrds_ice> 
-	  <nthrds_ocn>2</nthrds_ocn> 
-	  <nthrds_glc>2</nthrds_glc> 
-	  <nthrds_wav>2</nthrds_wav> 
-	  <nthrds_cpl>2</nthrds_cpl> 
-	</nthrds>
-	<rootpe>
-	  <rootpe_atm>0</rootpe_atm> 
-	  <rootpe_lnd>0</rootpe_lnd> 
-	  <rootpe_rof>0</rootpe_rof> 
-	  <rootpe_ice>0</rootpe_ice>    
-	  <rootpe_ocn>0</rootpe_ocn>   
-	  <rootpe_glc>0</rootpe_glc> 
-	  <rootpe_wav>0</rootpe_wav> 
-	  <rootpe_cpl>0</rootpe_cpl>                         
-	</rootpe>
-      </pes>
-    </mach>
-  </grid>
   <grid name="a%0.9x1.25">
      <mach name="cheyenne">
       <pes pesize="any" compset="_(CAM50|CAM60)%(CC|CV|CF|WC)">
diff --git a/cime_config/testdefs/testlist_cam.xml b/cime_config/testdefs/testlist_cam.xml
index 7a95c4591..d04f5d9d8 100644
--- a/cime_config/testdefs/testlist_cam.xml
+++ b/cime_config/testdefs/testlist_cam.xml
@@ -223,7 +223,7 @@
       <option name="wallclock">00:10:00</option>
     </options>
   </test>
-  <test compset="QSC6" grid="ne30_ne30_mg17" name="ERP_Ln9" testmods="cam/outfrq9s">
+  <test compset="QPC6" grid="ne30_ne30_mg17" name="ERP_Ln9" testmods="cam/outfrq9s">
     <machines>
       <machine name="cheyenne" compiler="intel" category="prebeta"/>
     </machines>