diff --git a/parm/parm_fv3diag/field_table_gsd b/parm/parm_fv3diag/field_table_thompson_aero_tke
similarity index 92%
rename from parm/parm_fv3diag/field_table_gsd
rename to parm/parm_fv3diag/field_table_thompson_aero_tke
index 27bbc2edfb6..e86fdad740a 100644
--- a/parm/parm_fv3diag/field_table_gsd
+++ b/parm/parm_fv3diag/field_table_thompson_aero_tke
@@ -33,17 +33,17 @@
  "TRACER", "atmos_mod", "water_nc"
            "longname",     "cloud  liquid water  number concentration"
            "units",        "/kg"
-       "profile_type", "fixed", "surface_value=1.e30" /
+       "profile_type", "fixed", "surface_value=0.0" /
 # prognostic cloud ice number concentration
  "TRACER", "atmos_mod", "ice_nc"
            "longname",     "cloud ice water number concentration"
            "units",        "/kg"
-       "profile_type", "fixed", "surface_value=1.e30" /
+       "profile_type", "fixed", "surface_value=0.0" /
 # prognostic rain number concentration
  "TRACER", "atmos_mod", "rain_nc"
            "longname",     "rain number concentration"
            "units",        "/kg"
-       "profile_type", "fixed", "surface_value=1.e30" /
+       "profile_type", "fixed", "surface_value=0.0" /
 # prognostic ozone mixing ratio tracer
  "TRACER", "atmos_mod", "o3mr"
            "longname",     "ozone mixing ratio"
@@ -62,4 +62,4 @@
  "TRACER", "atmos_mod", "sgs_tke"
            "longname",     "subgrid scale turbulent kinetic energy"
            "units",        "m2/s2"
-       "profile_type", "fixed", "surface_value=1.e30" /
+       "profile_type", "fixed", "surface_value=0.0" /
diff --git a/sorc/build_all.sh b/sorc/build_all.sh
index 7ec5478ddbc..1619b8213a5 100755
--- a/sorc/build_all.sh
+++ b/sorc/build_all.sh
@@ -6,8 +6,6 @@ set +x
 #
 # USER DEFINED STUFF:
 #
-# USE_PREINST_LIBS: set to "true" to use preinstalled libraries.
-#                   Anything other than "true"  will use libraries locally.
 #------------------------------------
 
 export USE_PREINST_LIBS="true"
diff --git a/sorc/build_gfs_wafs.sh b/sorc/build_gfs_wafs.sh
index 8c8aee6ac46..7ddde2d6789 100755
--- a/sorc/build_gfs_wafs.sh
+++ b/sorc/build_gfs_wafs.sh
@@ -4,13 +4,6 @@ set -eux
 source ./machine-setup.sh > /dev/null 2>&1
 cwd=$(pwd)
 
-USE_PREINST_LIBS=${USE_PREINST_LIBS:-"true"}
-if [ $USE_PREINST_LIBS = true ]; then
-  export MOD_PATH=/scratch3/NCEPDEV/nwprod/lib/modulefiles
-else
-  export MOD_PATH=${cwd}/lib/modulefiles
-fi
-
 # Check final exec folder exists
 if [ ! -d "../exec" ]; then
   mkdir ../exec
diff --git a/sorc/build_gldas.sh b/sorc/build_gldas.sh
index 37db45a60fb..635c2bee174 100755
--- a/sorc/build_gldas.sh
+++ b/sorc/build_gldas.sh
@@ -4,13 +4,6 @@ set -eux
 source ./machine-setup.sh > /dev/null 2>&1
 cwd=$(pwd)
 
-USE_PREINST_LIBS=${USE_PREINST_LIBS:-"true"}
-if [ $USE_PREINST_LIBS = true ]; then
-  export MOD_PATH=/scratch3/NCEPDEV/nwprod/lib/modulefiles
-else
-  export MOD_PATH=${cwd}/lib/modulefiles
-fi
-
 # Check final exec folder exists
 if [ ! -d "../exec" ]; then
   mkdir ../exec
diff --git a/sorc/build_gsi.sh b/sorc/build_gsi.sh
index b912f6c8d7c..beb46c1bd99 100755
--- a/sorc/build_gsi.sh
+++ b/sorc/build_gsi.sh
@@ -4,13 +4,6 @@ set -eux
 source ./machine-setup.sh > /dev/null 2>&1
 cwd=$(pwd)
 
-USE_PREINST_LIBS=${USE_PREINST_LIBS:-"true"}
-if [ $USE_PREINST_LIBS = true ]; then
-  export MOD_PATH=/scratch3/NCEPDEV/nwprod/lib/modulefiles
-else
-  export MOD_PATH=${cwd}/lib/modulefiles
-fi
-
 gsitarget=$target
 [[ "$target" == wcoss_cray ]] && gsitarget=cray
 
diff --git a/sorc/build_ncep_post.sh b/sorc/build_ncep_post.sh
index 8cd2569aba3..7132371b7a2 100755
--- a/sorc/build_ncep_post.sh
+++ b/sorc/build_ncep_post.sh
@@ -4,13 +4,6 @@ set -eux
 source ./machine-setup.sh > /dev/null 2>&1
 cwd=$(pwd)
 
-USE_PREINST_LIBS=${USE_PREINST_LIBS:-"true"}
-if [ $USE_PREINST_LIBS = true ]; then
-  export MOD_PATH=/scratch3/NCEPDEV/nwprod/lib/modulefiles
-else
-  export MOD_PATH=${cwd}/lib/modulefiles
-fi
-
 # Check final exec folder exists
 if [ ! -d "../exec" ]; then
   mkdir ../exec
diff --git a/sorc/checkout.sh b/sorc/checkout.sh
index 2dfd6d1b21a..1c6bfa2ffdc 100755
--- a/sorc/checkout.sh
+++ b/sorc/checkout.sh
@@ -44,7 +44,7 @@ if [[ ! -d gsi.fd ]] ; then
     git clone --recursive https://github.com/NOAA-EMC/GSI.git gsi.fd >> ${logdir}/checkout-gsi.log 2>&1
     cd gsi.fd
     git checkout a62dec6
-    git submodule update
+    git submodule update --init
     cd ${topdir}
 else
     echo 'Skip.  Directory gsi.fd already exists.'