From 4563541e7f2fd32e1b11ef43b3c2da9819860191 Mon Sep 17 00:00:00 2001
From: Lizzie Lundgren <elundgren@seas.harvard.edu>
Date: Fri, 28 Jul 2023 15:17:50 -0600
Subject: [PATCH] Minor cleanup changes

Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
---
 bld/build-namelist               | 2 +-
 cime_config/config_component.xml | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/bld/build-namelist b/bld/build-namelist
index 9289a0ebd5..b36f5d7cb5 100755
--- a/bld/build-namelist
+++ b/bld/build-namelist
@@ -2473,7 +2473,7 @@ if (($chem =~ /_mam4/ or $chem =~ /_mam5/) and ($phys =~ /cam6/ or $phys =~ /cam
             $first = 0;
         }
     }
-        if ($chem !~ /geoschem/) {
+    if ($chem !~ /geoschem/) {
         add_default($nl, 'ext_frc_specifier', 'val'=>$val);
         unless (defined $nl->get_value('ext_frc_type')) {
             add_default($nl, 'ext_frc_type',      'val'=>"'CYCLICAL'");
diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml
index c368028508..899c6083ae 100644
--- a/cime_config/config_component.xml
+++ b/cime_config/config_component.xml
@@ -187,7 +187,6 @@
       <value compset="_CAM%TJ16">-phys tj2016 -analytic_ic</value>
       <value compset="_CAM%GRAYRAD">-phys grayrad -analytic_ic</value>
       <value compset="_CAM%HS94">-phys held_suarez -analytic_ic</value>
-      <value compset="_CAM%GCHS">-phys held_suarez -chem geoschem -hemco -analytic_ic</value>
       <value compset="_CAM%KESSLER">-phys kessler -chem terminator -analytic_ic -nadv_tt=6</value>
 
       <!-- Aquaplanet -->
@@ -228,11 +227,6 @@
       <value compset="2000_CAM40%WXIE"   >waccmxie_ma_2000_cam4</value>
       <value compset="2000_CAM40%WX_"    >waccmx_ma_2000_cam4</value>
 
-      <value compset="2000_CAM40%GC"     >geoschem</value>
-      <value compset="CAM%GC"            >geoschem</value>
-      <value compset="CAM[456]0%GC"      >geoschem</value>
-      <value compset="CAM%GCHS"          >geoschem_baro_moist</value>
-
       <value compset="2000_CAM%DEV"      >2000_cam6</value>
       <value compset="2000_CAM60"        >2000_cam6</value>
       <value compset="2000_CAM60%WCTS"   >waccm_tsmlt_2000_cam6</value>
@@ -278,7 +272,7 @@
       <value compset="HIST_CAM60%CVBSX"  >hist_trop_strat_vbsext_cam6</value>
       <value compset="HIST_CAM60%CFIRE"  >hist_trop_strat_vbsfire_cam6</value>
       <value compset="HIST_CAM60%GC"     >hist_geoschem</value>
-      <value compset="HIST_CAM60%GC%NUDG"     >hist_geoschem_nudged</value>
+      <value compset="HIST_CAM60%GC%NUDG">hist_geoschem_nudged</value>
       <value compset="HIST_CAM60%WXIE"   >waccmx_ma_hist_cam6</value>
 
       <value compset="PIPD_CAM50"        >1850-PD_cam5</value>