diff --git a/bld/configure b/bld/configure
index 7f312ec363..4a2afa8b56 100755
--- a/bld/configure
+++ b/bld/configure
@@ -2214,19 +2214,11 @@ sub write_filepath
     if ($chem_src_dir) {
         print $fh "$chem_src_dir\n";
     }
- 
-    # Cloud-J for computing J-values in chemistry; currently only built for GEOS-Chem
-    if ($chem_pkg =~ 'geoschem') {
-	print $fh "$camsrcdir/src/chemistry/cloud_j/src/Core\n";
-    }
 
-    # HETP for aerosol thermodynamics in GEOS-Chem chemistry
+    # GEOS-Chem and dependencies; GEOS-Chem must be prior to Mozart
     if ($chem_pkg =~ 'geoschem') {
+	print $fh "$camsrcdir/src/chemistry/cloud_j/src/Core\n";
 	print $fh "$camsrcdir/src/chemistry/hetp/src/Core\n";
-    }
-
-    # GEOS-Chem must be prior to Mozart
-    if ($chem_pkg =~ 'geoschem') {
 	print $fh "$chem_src_dir/geoschem_src/GeosCore\n";
 	print $fh "$chem_src_dir/geoschem_src/GeosUtil\n";
 	print $fh "$chem_src_dir/geoschem_src/Headers\n";
diff --git a/cime_config/buildnml b/cime_config/buildnml
index 0c745e35d5..a077e13fcd 100755
--- a/cime_config/buildnml
+++ b/cime_config/buildnml
@@ -215,6 +215,7 @@ def buildnml(case, caseroot, compname):
         # -----------------------------------------------------
         # copy geos-chem config files to rundir if using geos-chem chemistry
         # -----------------------------------------------------
+
         if os.path.isdir(rundir) \
             and os.path.exists(os.path.join(caseroot, "species_database.yml"))\
             and '-chem geoschem' in CAM_CONFIG_OPTS: