diff --git a/src/conf/module-setup.csh.inc b/src/conf/module-setup.csh.inc
index 733b9a2c..3e894ca9 100644
--- a/src/conf/module-setup.csh.inc
+++ b/src/conf/module-setup.csh.inc
@@ -60,6 +60,12 @@ else if ( { test -d /glade } ) then
       source /glade/u/apps/ch/modulefiles/default/localinit/localinit.csh
     endif
     module purge
+else if ( { test -d /work/stampede } ) then
+    # We are on TACC Stampede
+    if ( ! { module help >& /dev/null } ) then
+      source /opt/apps/lmod/lmod/init/csh
+    endif
+    module purge
 else if ( { test -d /lustre -a -d /ncrc } ) then
     # We are on GAEA. 
     if ( ! { module help >& /dev/null } ) then
diff --git a/src/conf/module-setup.sh.inc b/src/conf/module-setup.sh.inc
index cb3587e4..5b64ffcf 100644
--- a/src/conf/module-setup.sh.inc
+++ b/src/conf/module-setup.sh.inc
@@ -75,6 +75,12 @@ elif [[ -d /glade ]] ; then
       . /glade/u/apps/ch/modulefiles/default/localinit/localinit.sh
     fi
     module purge
+elif [[ -d /work/stampede ]] ; then
+    # We are on TACC Stampede
+    if ( ! eval module help > /dev/null 2>&1 ) ; then
+      source /opt/apps/lmod/lmod/init/bash
+    fi
+    module purge
 elif [[ -d /lustre && -d /ncrc ]] ; then
     # We are on GAEA. 
     if ( ! eval module help > /dev/null 2>&1 ) ; then
diff --git a/src/incmake/env/cisl/cheyenne.pgi.mk b/src/incmake/env/cisl/cheyenne.pgi.mk
deleted file mode 100644
index bf265b43..00000000
--- a/src/incmake/env/cisl/cheyenne.pgi.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-MACHINE_ID=cheyenne
-FULL_MACHINE_ID=cheyenne
-USE_MODULES=YES
-DEFAULT_MODULE=$(FULL_MACHINE_ID)/ESMF_NUOPC
-BUILD_TARGET=$(FULL_MACHINE_ID).$(NEMS_COMPILER)
-NEMS_COMPILER=pgi
-MODULE_LOGIC=$(call ULIMIT_MODULE_LOGIC,60000)