diff --git a/ush/load_fv3gfs_modules.sh b/ush/load_fv3gfs_modules.sh
index b09f1bf166..ae0e381db4 100755
--- a/ush/load_fv3gfs_modules.sh
+++ b/ush/load_fv3gfs_modules.sh
@@ -19,33 +19,6 @@ source "${HOMEgfs}/versions/run.ver"
 # Load our modules:
 module use "${HOMEgfs}/modulefiles"
 
-# TODO: Testing.
-
-#if [[ "${MACHINE_ID}" == "wcoss2" || "${MACHINE_ID}" == "acorn" ]]; then
-#  # We are on WCOSS2 (Cactus or Dogwood)
-#  module load module_base.wcoss2
-#elif [[ "${MACHINE_ID}" == "jet" ]] ; then
-#  # We are on NOAA Jet
-#  module load module_base.jet
-#elif [[ "${MACHINE_ID}" == "hera" ]] ; then
-#  # We are on NOAA Hera
-#  module load module_base.hera
-#elif [[ "${MACHINE_ID}" == "orion" ]] ; then
-#  # We are on MSU Orion
-#  module load module_base.orion
-#elif [[ "${MACHINE_ID}" == "hercules" ]] ; then  
-#  # We are on MSU Hercules
-#  module load module_base.hercules
-#elif [[ "${MACHINE_ID}" == "gaea" ]] ; then
-#  # We are on GAEA.
-#  module load module_base.gaea
-#elif [[ "${MACHINE_ID}" == "s4" ]] ; then
-#  # We are on SSEC S4
-#  module load module_base.s4
-#else
-#  echo WARNING: UNKNOWN PLATFORM # TODO: Should an exception be raised here?
-#fi
-
 case "${MACHINE_ID}" in
   "wcoss2" | "hera" | "orion" | "hercules" | "gaea" | "jet" | "s4")
     module load "module_base.${MACHINE_ID}"
diff --git a/ush/load_ufsda_modules.sh b/ush/load_ufsda_modules.sh
index d8333083f4..68547cc05b 100755
--- a/ush/load_ufsda_modules.sh
+++ b/ush/load_ufsda_modules.sh
@@ -33,42 +33,6 @@ source "${HOMEgfs}/ush/module-setup.sh"
 # Load our modules:
 module use "${HOMEgfs}/sorc/gdas.cd/modulefiles"
 
-#if [[ "${MACHINE_ID}" == "wcoss2" || "${MACHINE_ID}" == "acorn" ]]; then
-#  # We are on WCOSS2 (Cactus or Dogwood)
-#  echo WARNING: UFSDA NOT SUPPORTED ON THIS PLATFORM
-#elif [[ "${MACHINE_ID}" == "jet" ]] ; then
-#  # We are on NOAA Jet
-#  echo WARNING: UFSDA NOT SUPPORTED ON THIS PLATFORM
-#elif [[ "${MACHINE_ID}" == "hera" ]] ; then
-#  # We are on NOAA Hera
-#  module load "${MODS}/hera"
-#  # set NETCDF variable based on ncdump location
-#  NETCDF=$( command -v ncdump)
-#  export NETCDF
-#elif [[ "${MACHINE_ID}" == "orion" ]] ; then
-#  # We are on MSU Orion
-#  module load "${MODS}/orion"
-#  # set NETCDF variable based on ncdump location
-#  ncdump=$( command -v ncdump)
-#  NETCDF=$( echo "${ncdump}" | cut -d " " -f 3 )
-#  export NETCDF
-#elif [[ "${MACHINE_ID}" == "hercules" ]] ; then  
-#  # We are on MSU Hercules
-#  module load "${MODS}/hercules"
-#  # set NETCDF variable based on ncdump location
-#  ncdump=$( command -v ncdump )
-#  NETCDF=$( echo "${ncdump}" | cut -d " " -f 3 )
-#  export NETCDF
-#elif [[ "${MACHINE_ID}" == "gaea" ]] ; then
-  # We are on GAEA.
-#  echo WARNING: UFSDA NOT SUPPORTED ON THIS PLATFORM
-#elif [[ "${MACHINE_ID}" == "s4" ]] ; then
-#  # We are on SSEC S4
-#  echo WARNING: UFSDA NOT SUPPORTED ON THIS PLATFORM
-#else
-#  echo WARNING: UNKNOWN PLATFORM
-#fi
-
 case "${MACHINE_ID}" in
   ("hera" | "orion" | "hercules")
     module load "${MODS}/${MACHINE_ID}"