diff --git a/modulefiles/module-setup.csh.inc b/modulefiles/module-setup.csh.inc
deleted file mode 100644
index 7086326627..0000000000
--- a/modulefiles/module-setup.csh.inc
+++ /dev/null
@@ -1,87 +0,0 @@
-set __ms_shell=csh
-
-eval "if ( -d / ) set __ms_shell=tcsh"
-
-if ( { test -d /lfs/f1 } ) then
-    # We are on NOAA Cactus or Dogwood
-    if ( ! { module help >& /dev/null } ) then
-        source /usr/share/lmod/lmod/init/$__ms_shell
-    fi
-    module reset
-else if ( { test -d /lfs3 } ) then
-    if ( ! { module help >& /dev/null } ) then
-            source /apps/lmod/lmod/init/$__ms_shell
-    endif
-    module purge
-else if ( { test -d /scratch1 } ) then
-    # We are on NOAA Hera
-    if ( ! { module help >& /dev/null } ) then
-        source /apps/lmod/lmod/init/$__ms_shell
-    endif
-    module purge
-elif [[ -d /work ]] ; then
-    # We are on MSU Orion or Hercules
-    if [[ -d /apps/other ]] ; then
-        # Hercules
-        init_path="/apps/other/lmod/lmod/init/$__ms_shell"
-    else
-        # Orion
-        init_path="/apps/lmod/lmod/init/$__ms_shell"
-    fi
-    if ( ! eval module help > /dev/null 2>&1 ) ; then
-        source "${init_path}"
-    fi
-    module purge
-else if ( { test -d /data/prod } ) then
-    # We are on SSEC S4
-    if ( ! { module help >& /dev/null } ) then
-        source /usr/share/lmod/lmod/init/$__ms_shell
-    endif
-    source /etc/profile
-    module purge
-else if ( { test -d /glade } ) then
-    # We are on NCAR Yellowstone
-    if ( ! { module help >& /dev/null } ) then
-        source /usr/share/Modules/init/$__ms_shell
-    endif
-    module purge
-else if ( { test -d /lustre -a -d /ncrc } ) then
-    # We are on GAEA.
-    if ( ! { module help >& /dev/null } ) then
-        # We cannot simply load the module command.  The GAEA
-        # /etc/csh.login modifies a number of module-related variables
-        # before loading the module command.  Without those variables,
-        # the module command fails.  Hence we actually have to source
-        # /etc/csh.login here.
-        source /etc/csh.login
-        set __ms_source_etc_csh_login=yes
-    else
-        set __ms_source_etc_csh_login=no
-    endif
-    module purge
-    unsetenv _LMFILES_
-    unsetenv _LMFILES_000
-    unsetenv _LMFILES_001
-    unsetenv LOADEDMODULES
-    module load modules
-    if ( { test -d /opt/cray/ari/modulefiles } ) then
-        module use -a /opt/cray/ari/modulefiles
-    endif
-    if ( { test -d /opt/cray/pe/ari/modulefiles } ) then
-        module use -a /opt/cray/pe/ari/modulefiles
-    endif
-    if ( { test -d /opt/cray/pe/craype/default/modulefiles } ) then
-        module use -a /opt/cray/pe/craype/default/modulefiles
-    endif
-    setenv NCEPLIBS /lustre/f1/pdata/ncep_shared/NCEPLIBS/lib
-    if ( { test -d /lustre/f1/pdata/ncep_shared/NCEPLIBS/lib } ) then
-      module use $NCEPLIBS/modulefiles
-    endif
-    if ( "$__ms_source_etc_csh_login" == yes ) then
-      source /etc/csh.login
-      unset __ms_source_etc_csh_login
-    endif
-else
-    # Workaround for csh limitation.  Use sh to print to stderr.
-    sh -c 'echo WARNING: UNKNOWN PLATFORM 1>&2'
-endif
diff --git a/modulefiles/module-setup.sh.inc b/modulefiles/module-setup.sh.inc
deleted file mode 100644
index db9dabffe1..0000000000
--- a/modulefiles/module-setup.sh.inc
+++ /dev/null
@@ -1,110 +0,0 @@
-# Create a test function for sh vs. bash detection.  The name is
-# randomly generated to reduce the chances of name collision.
-__ms_function_name="setup__test_function__$$"
-eval "$__ms_function_name() { /bin/true ; }"
-
-# Determine which shell we are using
-__ms_ksh_test=$( eval '__text="text" ; if [[ $__text =~ ^(t).* ]] ; then printf "%s" ${.sh.match[1]} ; fi' 2> /dev/null | cat )
-__ms_bash_test=$( eval 'if ( set | grep '$__ms_function_name' | grep -v name > /dev/null 2>&1 ) ; then echo t ; fi ' 2> /dev/null | cat )
-
-if [[ ! -z "$__ms_ksh_test" ]] ; then
-    __ms_shell=ksh
-elif [[ ! -z "$__ms_bash_test" ]] ; then
-    __ms_shell=bash
-else
-    # Not bash or ksh, so assume sh.
-    __ms_shell=sh
-fi
-
-if [[ -d /lfs/f1 ]] ; then
-    # We are on NOAA Cactus or Dogwood
-    if ( ! eval module help > /dev/null 2>&1 ) ; then
-        source /usr/share/lmod/lmod/init/$__ms_shell
-    fi
-    module reset
-elif [[ -d /mnt/lfs1 ]] ; then
-    # We are on NOAA Jet
-    if ( ! eval module help > /dev/null 2>&1 ) ; then
-        source /apps/lmod/lmod/init/$__ms_shell
-    fi
-    module purge
-elif [[ -d /scratch1 ]] ; then
-    # We are on NOAA Hera
-    if ( ! eval module help > /dev/null 2>&1 ) ; then
-        source /apps/lmod/lmod/init/$__ms_shell
-    fi
-    module purge
-elif [[ -d /work ]] ; then
-    # We are on MSU Orion or Hercules
-    if [[ -d /apps/other ]] ; then
-        # Hercules
-        init_path="/apps/other/lmod/lmod/init/$__ms_shell"
-    else
-        # Orion
-        init_path="/apps/lmod/lmod/init/$__ms_shell"
-    fi
-    if ( ! eval module help > /dev/null 2>&1 ) ; then
-        source "${init_path}"
-    fi
-    module purge
-elif [[ -d /glade ]] ; then
-    # We are on NCAR Yellowstone
-    if ( ! eval module help > /dev/null 2>&1 ) ; then
-        . /usr/share/Modules/init/$__ms_shell
-    fi
-    module purge
-elif [[ -d /lustre && -d /ncrc ]] ; then
-    # We are on GAEA.
-    if ( ! eval module help > /dev/null 2>&1 ) ; then
-        # We cannot simply load the module command.  The GAEA
-        # /etc/profile modifies a number of module-related variables
-        # before loading the module command.  Without those variables,
-        # the module command fails.  Hence we actually have to source
-        # /etc/profile here.
-        source /etc/profile
-        __ms_source_etc_profile=yes
-    else
-        __ms_source_etc_profile=no
-    fi
-    module purge
-    # clean up after purge
-    unset _LMFILES_
-    unset _LMFILES_000
-    unset _LMFILES_001
-    unset LOADEDMODULES
-    module load modules
-    if [[ -d /opt/cray/ari/modulefiles ]] ; then
-        module use -a /opt/cray/ari/modulefiles
-    fi
-    if [[ -d /opt/cray/pe/ari/modulefiles ]] ; then
-        module use -a /opt/cray/pe/ari/modulefiles
-    fi
-    if [[ -d /opt/cray/pe/craype/default/modulefiles ]] ; then
-        module use -a /opt/cray/pe/craype/default/modulefiles
-    fi
-    if [[ -s /etc/opt/cray/pe/admin-pe/site-config ]] ; then
-        source /etc/opt/cray/pe/admin-pe/site-config
-    fi
-    export NCEPLIBS=/lustre/f1/pdata/ncep_shared/NCEPLIBS/lib
-    if [[ -d "$NCEPLIBS" ]] ; then
-        module use $NCEPLIBS/modulefiles
-    fi
-    if [[ "$__ms_source_etc_profile" == yes ]] ; then
-      source /etc/profile
-      unset __ms_source_etc_profile
-    fi
-elif [[ -d /data/prod ]] ; then
-    # We are on SSEC's S4
-    if ( ! eval module help > /dev/null 2>&1 ) ; then
-        source /usr/share/lmod/lmod/init/$__ms_shell
-    fi
-    module purge
-else
-    echo WARNING: UNKNOWN PLATFORM 1>&2
-fi
-
-unset __ms_shell
-unset __ms_ksh_test
-unset __ms_bash_test
-unset $__ms_function_name
-unset __ms_function_name
diff --git a/ush/load_fv3gfs_modules.sh b/ush/load_fv3gfs_modules.sh
index b4f23fa331..48885c62e4 100755
--- a/ush/load_fv3gfs_modules.sh
+++ b/ush/load_fv3gfs_modules.sh
@@ -10,7 +10,7 @@ fi
 ulimit_s=$( ulimit -S -s )
 
 # Find module command and purge:
-source "${HOMEgfs}/modulefiles/module-setup.sh.inc"
+source "${HOMEgfs}/ush/module-setup.sh"
 
 # Source versions file for runtime
 source "${HOMEgfs}/versions/run.ver"
diff --git a/ush/load_ufsda_modules.sh b/ush/load_ufsda_modules.sh
index 1ab730c30e..f15ae5666c 100755
--- a/ush/load_ufsda_modules.sh
+++ b/ush/load_ufsda_modules.sh
@@ -27,7 +27,7 @@ fi
 ulimit_s=$( ulimit -S -s )
 
 # Find module command and purge:
-source "${HOMEgfs}/modulefiles/module-setup.sh.inc"
+source "${HOMEgfs}/ush/module-setup.sh"
 
 # Load our modules:
 module use "${HOMEgfs}/sorc/gdas.cd/modulefiles"
diff --git a/ush/module-setup.sh b/ush/module-setup.sh
index fd656966bf..e204bae8a2 100755
--- a/ush/module-setup.sh
+++ b/ush/module-setup.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 set -u
 
+source "${HOMEgfs}/ush/detect_machine.sh" 
+
 if [[ ${MACHINE_ID} = jet* ]] ; then
     # We are on NOAA Jet
     if ( ! eval module help > /dev/null 2>&1 ) ; then