diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000..d9a042c6ca
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,16 @@
+# Ignore all compiled files
+*.pyc
+*.o
+*.mod
+
+# Ignore exec folder
+exec/
+
+# Ignore sorc folders from externals
+sorc/logs/
+sorc/fv3gfs.fd/
+sorc/gfs_post.fd/
+sorc/gsi.fd/
+sorc/ufs_utils.fd/
+sorc/gfs_wafs.fd/
+sorc/verif-global.fd/
diff --git a/Externals.cfg b/Externals.cfg
new file mode 100644
index 0000000000..c58ec88ac9
--- /dev/null
+++ b/Externals.cfg
@@ -0,0 +1,46 @@
+# External sub-modules of global-workflow
+
+[NEMSfv3gfs]
+tag = gfs.v16_PhysicsUpdate
+local_path = sorc/fv3gfs.fd
+repo_url = ssh://vlab.ncep.noaa.gov:29418/NEMSfv3gfs
+protocol = git
+required = True
+
+[GSI]
+hash = cb8f69d8
+local_path = sorc/gsi.fd
+repo_url = ssh://vlab.ncep.noaa.gov:29418/ProdGSI
+protocol = git
+required = True
+
+[EMC_post]
+hash = ba7e59b2
+local_path = sorc/gfs_post.fd
+repo_url = https://github.com/NOAA-EMC/EMC_post.git
+protocol = git
+required = True
+
+[UFS_UTILS]
+tag = v1.1.0
+local_path = sorc/ufs_utils.fd
+repo_url = https://github.com/NOAA-EMC/UFS_UTILS.git
+protocol = git
+required = True
+
+[EMC_verif-global]
+tag = verif_global_v1.5.0
+local_path = sorc/verif-global.fd
+repo_url = ssh://vlab.ncep.noaa.gov:29418/EMC_verif-global
+protocol = git
+required = True
+
+[EMC_gfs_wafs]
+tag = gfs_wafs.v5.0.11
+local_path = sorc/gfs_wafs.fd
+repo_url = https://github.com/NOAA-EMC/EMC_gfs_wafs.git
+protocol = git
+required = False
+
+[externals_description]
+schema_version = 1.0.0
diff --git a/README.md b/README.md
new file mode 100644
index 0000000000..3fac2751aa
--- /dev/null
+++ b/README.md
@@ -0,0 +1,49 @@
+# global-workflow
+Global Superstructure/Workflow currently supporting the Finite-Volume on a Cubed-Sphere Global Forecast System (FV3GFS)
+
+The global-workflow depends on the following prerequisities to be available on the system:
+
+* workload management platform / scheduler - LSF or SLURM
+* workflow manager - ROCOTO (https://github.com/christopherwharrop/rocoto)
+* modules - NCEPLIBS (various), esmf v8.0.0bs48, hdf5, intel/ips v18, impi v18, wgrib2, netcdf v4.7.0, hpss, gempak (see module files under /modulefiles for additional details)
+* manage_externals - A utility from ESMCI to checkout external dependencies. Manage_externals can be obtained at the following address and should be in the users PATH: https://github.com/ESMCI/manage_externals
+
+The global-workflow current supports the following machines:
+
+* WCOSS-Dell
+* WCOSS-Cray
+* Hera
+
+## Build global-workflow:
+
+### 1. Check out components
+
+The global-workflow uses the manage_externals utility to handle checking out its components. The manic-v1.1.8 manage_externals tag is supported. The manage_externals utility will be replacing the current checkout.sh script.
+
+Run manage_externals (checkout_externals) while at top of clone:
+
+```
+$ checkout_externals -e Externals.cfg
+```
+
+If checkout_externals is not in your $PATH then use full path to it:
+
+* WCOSS-Dell: /gpfs/dell2/emc/modeling/noscrub/emc.glopara/git/manage_externals/manic-v1.1.8/checkout_externals
+* WCOSS-Cray: /gpfs/hps3/emc/global/noscrub/emc.glopara/git/manage_externals/manic-v1.1.8/checkout_externals
+* Hera: /scratch1/NCEPDEV/global/glopara/git/manage_externals/manic-v1.1.8/checkout_externals
+
+### 2. Build components
+
+While in /sorc folder:
+```
+$ sh build_all.sh
+```
+
+### 3. Link components
+
+While in /sorc folder:
+```
+$ sh link_fv3gfs.sh emc $MACHINE
+```
+
+...where $MACHINE is "dell", "cray", or "hera".
diff --git a/modulefiles/module_nemsutil.hera b/modulefiles/module_nemsutil.hera
deleted file mode 100644
index f1908fdf6e..0000000000
--- a/modulefiles/module_nemsutil.hera
+++ /dev/null
@@ -1,10 +0,0 @@
-#%Module#####################################################
-## Module file for nemsutil
-#############################################################
-
-module use -a /scratch2/NCEPDEV/nwprod/NCEPLIBS/modulefiles
-module load w3nco/2.0.6
-module load bacio/2.0.3
-module load nemsio/2.2.3
-
-export FCMP=ifort
diff --git a/modulefiles/module_nemsutil.wcoss b/modulefiles/module_nemsutil.wcoss
deleted file mode 100644
index f421c1a88b..0000000000
--- a/modulefiles/module_nemsutil.wcoss
+++ /dev/null
@@ -1,13 +0,0 @@
-#%Module#####################################################
-## Module file for nemsutil
-#############################################################
-
-# Loading Intel Compiler Suite
-module load ics/14.0.1
-
-# Loding nceplibs modules
-module load w3nco/v2.0.6
-module load bacio/v2.0.1
-module load nemsio/v2.2.1
-
-export FCMP=ifort
diff --git a/modulefiles/module_nemsutil.wcoss_cray b/modulefiles/module_nemsutil.wcoss_cray
deleted file mode 100644
index 371c8e0245..0000000000
--- a/modulefiles/module_nemsutil.wcoss_cray
+++ /dev/null
@@ -1,17 +0,0 @@
-#%Module#####################################################
-## Module file for nemsutil
-#############################################################
-
-module purge
-module load modules
-module load PrgEnv-intel
-module load cray-mpich
-module load craype-sandybridge
-
-module load w3nco-intel/2.0.6
-module load bacio-intel/2.0.1
-
-export NEMSIO_INC=/usrx/local/nceplibs/nemsio/nemsio_v2.2.3/incmod
-export NEMSIO_LIB=/usrx/local/nceplibs/nemsio/nemsio_v2.2.3/libnemsio_v2.2.3.a
-
-export FCMP=ftn
diff --git a/modulefiles/module_nemsutil.wcoss_cray_userlib b/modulefiles/module_nemsutil.wcoss_cray_userlib
deleted file mode 100644
index 53fad475a5..0000000000
--- a/modulefiles/module_nemsutil.wcoss_cray_userlib
+++ /dev/null
@@ -1,19 +0,0 @@
-#%Module#####################################################
-## Module file for nemsutil
-#############################################################
-
-# Load Intel environment
-module purge
-module load modules
-module load PrgEnv-intel
-module load cray-mpich
-module load craype-sandybridge
-
-# Load NCEPLIBS modules
-module unuse /gpfs/hps/nco/ops/nwprod/lib/modulefiles
-module use $MOD_PATH
-module load w3nco/v2.0.6
-module load bacio/v2.0.2
-module load nemsio/v2.2.3
-
-export FCMP=ftn
diff --git a/modulefiles/module_nemsutil.wcoss_dell_p3 b/modulefiles/module_nemsutil.wcoss_dell_p3
deleted file mode 100644
index e93d581651..0000000000
--- a/modulefiles/module_nemsutil.wcoss_dell_p3
+++ /dev/null
@@ -1,12 +0,0 @@
-#%Module#####################################################
-## Module file for nemsutil
-#############################################################
-
-module load ips/18.0.1.163
-module load impi/18.0.1
-
-module load bacio/2.0.2
-module load w3nco/2.0.6
-module load nemsio/2.2.3 
-
-export FCMP=ifort
diff --git a/modulefiles/modulefile.grib_util.wcoss b/modulefiles/modulefile.grib_util.wcoss
deleted file mode 100644
index 0ae2e8f49e..0000000000
--- a/modulefiles/modulefile.grib_util.wcoss
+++ /dev/null
@@ -1,32 +0,0 @@
-#%Module######################################################################
-proc ModulesHelp { } {
-  puts stderr "Load modules for building GRIB utilities"
-}
-module-whatis "This module loads the modules and libraries for building\
-               the GRIB utilities, including jasper, png, zlib, bacio, g2,\
-               w3emc, w3nco, ip, sp, and iobuf."
-
-conflict build_grib_util
-
-#
-#  Loading required system modules
-#
-   module load ics
-   module switch ics/15.0.6
-   module load jasper/v1.900.1
-   module load png/v1.2.44
-   module load z/v1.2.6
-
-# Loading Intel-Compiled NCEP Libraries
-   module load bacio/v2.0.1
-   module load w3emc/v2.2.0
-   module load w3nco/v2.0.6
-   module load ip/v3.0.0
-   module load sp/v2.0.2
-
-   # pre-implemented g2 v3.1.0
-   module use /nwtest2/lib/modulefiles
-   module load g2/v3.1.0
-
-setenv FCMP ifort
-setenv CCMP icc
diff --git a/modulefiles/modulefile.grib_util.wcoss_cray b/modulefiles/modulefile.grib_util.wcoss_cray
deleted file mode 100644
index 191baa15df..0000000000
--- a/modulefiles/modulefile.grib_util.wcoss_cray
+++ /dev/null
@@ -1,22 +0,0 @@
-#%Module######################################################################
-module unload craype-haswell
-module load craype-sandybridge
-module unload PrgEnv-cray
-module load PrgEnv-intel/5.2.56
-module switch intel/15.0.6.233
-module load iobuf/2.0.7
-
-module load bacio-intel/2.0.1
-module load w3emc-intel/2.2.0
-module load w3nco-intel/2.0.6
-module load ip-intel/3.0.0
-module load sp-intel/2.0.2
-module load jasper-gnu-sandybridge/1.900.1
-module load png-intel-sandybridge/1.2.49
-module load zlib-intel-sandybridge/1.2.7
-
-module use /gpfs/hps/nco/ops/nwtest/lib/modulefiles
-module load g2-intel/3.1.0
-
-export FCMP=ftn
-export CCMP=cc
diff --git a/modulefiles/modulefile.grib_util.wcoss_cray_userlib b/modulefiles/modulefile.grib_util.wcoss_cray_userlib
deleted file mode 100644
index 56ebe0c336..0000000000
--- a/modulefiles/modulefile.grib_util.wcoss_cray_userlib
+++ /dev/null
@@ -1,22 +0,0 @@
-#%Module######################################################################
-module unload craype-haswell
-module load craype-sandybridge
-module unload PrgEnv-cray
-module load PrgEnv-intel/5.2.56
-module switch intel/15.0.6.233
-module load iobuf/2.0.7
-
-module unuse /gpfs/hps/nco/ops/nwprod/lib/modulefiles
-module use -a $MOD_PATH
-module load bacio/v2.0.2
-module load w3emc/v2.2.0
-module load w3nco/v2.0.6
-module load ip/v3.0.0
-module load sp/v2.0.2
-module load jasper/v1.900.1
-module load png/v1.2.44
-module load z/v1.2.6
-module load g2/v3.1.0
-
-export FCMP=ftn
-export CCMP=cc
diff --git a/modulefiles/modulefile.grib_util.wcoss_dell_p3 b/modulefiles/modulefile.grib_util.wcoss_dell_p3
deleted file mode 100644
index bbebec9cbf..0000000000
--- a/modulefiles/modulefile.grib_util.wcoss_dell_p3
+++ /dev/null
@@ -1,15 +0,0 @@
-#%Module######################################################################
-
-module load bacio/2.0.2
-module load w3emc/2.3.0
-module load w3nco/2.0.6
-module load ip/3.0.1
-module load sp/2.0.2
-
-module load jasper/1.900.1
-module load libpng/1.2.59
-module load zlib/1.2.11
-module load g2/3.1.0
-
-export FCMP=ifort
-export CCMP=icc
diff --git a/modulefiles/modulefile.prod_util.wcoss_cray b/modulefiles/modulefile.prod_util.wcoss_cray
deleted file mode 100644
index 51031c6bdd..0000000000
--- a/modulefiles/modulefile.prod_util.wcoss_cray
+++ /dev/null
@@ -1,11 +0,0 @@
-#%Module#####################################################
-module purge
-module load modules
-module load PrgEnv-intel
-module load cray-mpich
-module load craype-sandybridge
-
-module load w3nco-intel/2.0.6
-
-export FCMP=ftn
-export CCMP=cc
diff --git a/modulefiles/modulefile.prod_util.wcoss_cray_userlib b/modulefiles/modulefile.prod_util.wcoss_cray_userlib
deleted file mode 100644
index dd5209fcf0..0000000000
--- a/modulefiles/modulefile.prod_util.wcoss_cray_userlib
+++ /dev/null
@@ -1,13 +0,0 @@
-#%Module#####################################################
-module purge
-module load modules
-module load PrgEnv-intel
-module load cray-mpich
-module load craype-sandybridge
-
-module unuse /gpfs/hps/nco/ops/nwprod/lib/modulefiles
-module use -a $MOD_PATH
-module load w3nco/v2.0.6
-
-export FCMP=ftn
-export CCMP=cc
diff --git a/modulefiles/modulefile.prod_util.wcoss_dell_p3 b/modulefiles/modulefile.prod_util.wcoss_dell_p3
deleted file mode 100644
index 9186e13eb8..0000000000
--- a/modulefiles/modulefile.prod_util.wcoss_dell_p3
+++ /dev/null
@@ -1,6 +0,0 @@
-#%Module#####################################################
-
-module load w3nco/2.0.6
-
-export FCMP=ifort
-export CCMP=icc
diff --git a/modulefiles/modulefile.wgrib2.wcoss b/modulefiles/modulefile.wgrib2.wcoss
deleted file mode 100644
index 0eea72e391..0000000000
--- a/modulefiles/modulefile.wgrib2.wcoss
+++ /dev/null
@@ -1,24 +0,0 @@
-#%Module######################################################################
-#############################################################
-##     Lin.Gan@noaa.gov
-##     EMC
-## wgrib2 v2.0.5
-#############################################################
-proc ModulesHelp { } {
-puts stderr "Set environment veriables for wgrib2"
-puts stderr "This module initializes the users environment"
-puts stderr "to build the wgrib2 for WCOSS production.\n"
-}
-module-whatis "wgrib2"
-
-set ver v2.0.5
-
-module load ics/15.0.6
-module load NetCDF/4.2/serial
-module load jasper/v1.900.1
-module load png/v1.2.44
-module load z/v1.2.6
-module load ip/v3.0.0
-module load sp/v2.0.2
-module load g2c/v1.5.0
-
diff --git a/modulefiles/modulefile.wgrib2.wcoss_cray b/modulefiles/modulefile.wgrib2.wcoss_cray
deleted file mode 100644
index 4d933141ad..0000000000
--- a/modulefiles/modulefile.wgrib2.wcoss_cray
+++ /dev/null
@@ -1,13 +0,0 @@
-#%Module######################################################################
-module load PrgEnv-gnu/5.2.56
-module load cray-netcdf/4.3.2
-module load craype/2.3.0
-module load craype-sandybridge
-module load /gpfs/hps/nco/ops/nwtest/lib/modulefiles/g2c-gnu/1.5.0
-
-module load jasper-gnu-sandybridge/1.900.1
-module load png-gnu-sandybridge/1.2.49
-module load zlib-gnu-sandybridge/1.2.7
-
-export FCMP=ftn
-export CCMP=cc
diff --git a/modulefiles/modulefile.wgrib2.wcoss_cray_userlib b/modulefiles/modulefile.wgrib2.wcoss_cray_userlib
deleted file mode 100644
index 7b41a17f9f..0000000000
--- a/modulefiles/modulefile.wgrib2.wcoss_cray_userlib
+++ /dev/null
@@ -1,15 +0,0 @@
-#%Module######################################################################
-module load PrgEnv-gnu/5.2.56
-module load cray-netcdf/4.3.2
-module load craype/2.3.0
-module load craype-sandybridge
-
-module unuse /gpfs/hps/nco/ops/nwprod/lib/modulefiles
-module use -a $MOD_PATH
-module load jasper/v1.900.1
-module load png/v1.2.44
-module load z/v1.2.6
-module load g2c/v1.5.0
-
-export FCMP=ftn
-export CCMP=cc
diff --git a/modulefiles/modulefile.wgrib2.wcoss_dell_p3 b/modulefiles/modulefile.wgrib2.wcoss_dell_p3
deleted file mode 100644
index 9a43e3ffd9..0000000000
--- a/modulefiles/modulefile.wgrib2.wcoss_dell_p3
+++ /dev/null
@@ -1,11 +0,0 @@
-#%Module######################################################################
-
-module load ips/18.0.1.163
-
-module load g2c/1.5.0
-module load jasper/1.900.1
-module load libpng/1.2.59
-module load zlib/1.2.11
-
-export FCMP=ifort
-export CCMP=icc
diff --git a/sorc/build_all.sh b/sorc/build_all.sh
index b24e32e111..50a31e14f5 100755
--- a/sorc/build_all.sh
+++ b/sorc/build_all.sh
@@ -112,18 +112,20 @@ fi
 }
 
 #------------------------------------
-# build gfs_wafs 
-#------------------------------------
-$Build_gfs_wafs  && {
-echo " .... Building gfs_wafs  .... "
-./build_gfs_wafs.sh > $logs_dir/build_gfs_wafs.log 2>&1
-rc=$?
-if [[ $rc -ne 0 ]] ; then
+# build gfs_wafs - optional checkout 
+#------------------------------------
+if [ -d gfs_wafs.fd ]; then
+  $Build_gfs_wafs  && {
+  echo " .... Building gfs_wafs  .... "
+  ./build_gfs_wafs.sh > $logs_dir/build_gfs_wafs.log 2>&1
+  rc=$?
+  if [[ $rc -ne 0 ]] ; then
     echo "Fatal error in building gfs_wafs."
     echo "The log file is in $logs_dir/build_gfs_wafs.log"
-fi
-((err+=$rc))
+  fi
+  ((err+=$rc))
 }
+fi
 
 #------------------------------------
 # build sfcanl_nsttfchg 
@@ -282,24 +284,6 @@ if [ $target = wcoss -o $target = wcoss_cray -o $target = wcoss_dell_p3 ]; then
  }
 fi
 
-#------------------------------------
-# build prod_util
-#------------------------------------
-$Build_prod_util && {
-echo " .... prod_util build not currently supported .... "
-#echo " .... Building prod_util .... "
-#./build_prod_util.sh > $logs_dir/build_prod_util.log 2>&1
-}
-
-#------------------------------------
-# build grib_util
-#------------------------------------
-$Build_grib_util && {
-echo " .... grib_util build not currently supported .... "
-#echo " .... Building grib_util .... "
-#./build_grib_util.sh > $logs_dir/build_grib_util.log 2>&1
-}
-
 #------------------------------------
 # Exception Handling
 #------------------------------------
diff --git a/sorc/build_grib_util.sh b/sorc/build_grib_util.sh
deleted file mode 100755
index 6569cc22c0..0000000000
--- a/sorc/build_grib_util.sh
+++ /dev/null
@@ -1,88 +0,0 @@
-#! /usr/bin/env bash
-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
-  source ../modulefiles/modulefile.grib_util.$target             > /dev/null 2>&1
-else
-  export MOD_PATH=${cwd}/lib/modulefiles
-  if [ $target = wcoss_cray ]; then
-    source ../modulefiles/modulefile.grib_util.${target}_userlib > /dev/null 2>&1
-  else
-    source ../modulefiles/modulefile.grib_util.$target           > /dev/null 2>&1
-  fi
-fi
-
-# Move to util/sorc folder
-cd ../util/sorc
-
-# Check final exec folder exists
-if [ ! -d "../exec" ]; then
-  mkdir ../exec
-fi
-
-for grib_util in cnvgrib copygb2 degrib2 grbindex tocgrib2 tocgrib \
-                 copygb grb2index grib2grib tocgrib2super
-do
- cd $grib_util.fd
- make -f makefile_$target clean
- make -f makefile_$target
- make -f makefile_$target install
- make -f makefile_$target clean
- cd ..
-done
-
-#
-# compile wgrib
-#
-cd wgrib.cd
- make -f makefile_$target clean
- make -f makefile_$target
- make -f makefile_$target install
- make -f makefile_$target clean
-cd ..
-
-#
-# compile wgrib2
-#
-cd $cwd
-source ./machine-setup.sh > /dev/null 2>&1
-
-if [ $target = wcoss_cray -a $USE_PREINST_LIBS != true ]; then
-  source ../modulefiles/modulefile.wgrib2.${target}_userlib > /dev/null 2>&1
-else
-  source ../modulefiles/modulefile.wgrib2.$target           > /dev/null 2>&1
-fi
-
-# Move to util/sorc folder
-cd ../util/sorc
-cwd=`pwd`
-
-#----------------------------------------------------------------
-export CPPFLAGS="-ffast-math -O3 -DGFORTRAN"
-cd $cwd/wgrib2.cd/gctpc/
-make -f makefile.gctpc clean
-make -f makefile.gctpc
-rm -f *.o
-#----------------------------------------------------------------
-if [ $target = wcoss_cray ]; then
-  export FFLAGS=-O2
-  cd $cwd/wgrib2.cd/iplib/
-  make clean
-  make
-  rm -f *.o
-fi
-#----------------------------------------------------------------
-cd $cwd/wgrib2.cd
-module list
-make -f makefile_$target clean
-make -f makefile_$target
-make -f makefile_$target install
-make -f makefile_$target clean
-#----------------------------------------------------------------
-
-exit
diff --git a/sorc/build_prod_util.sh b/sorc/build_prod_util.sh
deleted file mode 100755
index e4220f7c26..0000000000
--- a/sorc/build_prod_util.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#! /usr/bin/env bash
-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
-  source ../modulefiles/modulefile.prod_util.$target             > /dev/null 2>&1
-else
-  export MOD_PATH=${cwd}/lib/modulefiles
-  if [ $target = wcoss_cray ]; then
-    source ../modulefiles/modulefile.prod_util.${target}_userlib > /dev/null 2>&1
-  else
-    source ../modulefiles/modulefile.prod_util.$target           > /dev/null 2>&1
-  fi
-fi
-
-# Move to util/sorc folder
-cd ../util/sorc
-
-# Check final exec folder exists
-if [ ! -d "../exec" ]; then
-  mkdir ../exec
-fi
-
-for prod_util in fsync_file
-do
- cd $prod_util.cd
- make -f makefile clean
- make -f makefile
- make -f makefile install
- make -f makefile clean
- cd ..
-done
-
-for prod_util in mdate ndate nhour
-do
- cd $prod_util.fd
- make -f makefile clean
- make -f makefile
- make -f makefile install
- make -f makefile clean
- cd ..
-done
-exit
diff --git a/sorc/fv3gfs_build.cfg b/sorc/fv3gfs_build.cfg
index 8143eb0bd3..93fab78443 100644
--- a/sorc/fv3gfs_build.cfg
+++ b/sorc/fv3gfs_build.cfg
@@ -18,8 +18,6 @@
  Building fv3nc2nemsio (fv3nc2nemsio) .................. yes
  Building regrid_nemsio (regrid_nemsio) ................ yes
  Building gfs_util (gfs_util) .......................... yes
- Building prod_util (prod_util) ........................ no
- Building grib_util (grib_util) ........................ no
  
 # -- END --
 
diff --git a/sorc/link_fv3gfs.sh b/sorc/link_fv3gfs.sh
index 8671b3dba0..1e7ef263a8 100755
--- a/sorc/link_fv3gfs.sh
+++ b/sorc/link_fv3gfs.sh
@@ -74,10 +74,10 @@ cd ${pwd}/../util               ||exit 8
     done
 
 
-#------------------------------
-#--add gfs_wafs link if on Dell
-if [ $machine = dell -o $machine = hera ]; then 
-#------------------------------
+#-----------------------------------
+#--add gfs_wafs link if checked out
+if [ -d ${pwd}/gfs_wafs.fd ]; then 
+#-----------------------------------
  cd ${pwd}/../jobs               ||exit 8
      $LINK ../sorc/gfs_wafs.fd/jobs/*                         .
  cd ${pwd}/../parm               ||exit 8
@@ -173,7 +173,7 @@ $LINK ../sorc/fv3gfs.fd/NEMS/exe/global_fv3gfs.x .
 [[ -s gfs_ncep_post ]] && rm -f gfs_ncep_post
 $LINK ../sorc/gfs_post.fd/exec/ncep_post gfs_ncep_post
 
-if [ $machine = dell -o $machine = hera ]; then 
+if [ -d ${pwd}/gfs_wafs.fd ]; then 
     for wafsexe in wafs_awc_wafavn  wafs_blending  wafs_cnvgrib2  wafs_gcip  wafs_makewafs  wafs_setmissing; do
         [[ -s $wafsexe ]] && rm -f $wafsexe
         $LINK ../sorc/gfs_wafs.fd/exec/$wafsexe .
@@ -229,7 +229,7 @@ cd ${pwd}/../sorc   ||   exit 8
     done
 
 
-    if [ $machine = dell -o $machine = hera ]; then
+    if [ -d ${pwd}/gfs_wafs.fd ]; then 
         $SLINK gfs_wafs.fd/sorc/wafs_awc_wafavn.fd                                              wafs_awc_wafavn.fd
         $SLINK gfs_wafs.fd/sorc/wafs_blending.fd                                                wafs_blending.fd
         $SLINK gfs_wafs.fd/sorc/wafs_cnvgrib2.fd                                                wafs_cnvgrib2.fd
@@ -254,5 +254,3 @@ fi
 
 exit 0
 
-
-
diff --git a/sorc/partial_build.sh b/sorc/partial_build.sh
index 885548f052..da306969a0 100755
--- a/sorc/partial_build.sh
+++ b/sorc/partial_build.sh
@@ -14,9 +14,7 @@
                        "Build_gfs_bufrsnd" \
                        "Build_fv3nc2nemsio" \
                        "Build_regrid_nemsio" \
-                       "Build_gfs_util" \
-                       "Build_prod_util" \
-                       "Build_grib_util")
+                       "Build_gfs_util")
 
 #
 # function parse_cfg: read config file and retrieve the values