diff --git a/ccpp/build_ccpp.sh b/ccpp/build_ccpp.sh
index 8d8ef89ce..fe1f64fe7 100755
--- a/ccpp/build_ccpp.sh
+++ b/ccpp/build_ccpp.sh
@@ -6,7 +6,7 @@ set -eu
 # List of valid/tested machines
 VALID_MACHINES=( wcoss_cray wcoss_dell_p3 gaea.intel jet.intel \
                  hera.intel hera.gnu orion.intel \
-                 cheyenne.intel cheyenne.intel-impi cheyenne.gnu cheyenne.pgi endeavor.intel \
+                 cheyenne.intel cheyenne.intel-impi cheyenne.gnu endeavor.intel \
                  stampede.intel supermuc_phase2.intel macosx.gnu \
                  linux.intel linux.gnu linux.pgi )
 
diff --git a/ccpp/framework b/ccpp/framework
index 7c3673d3a..d31bdb7ac 160000
--- a/ccpp/framework
+++ b/ccpp/framework
@@ -1 +1 @@
-Subproject commit 7c3673d3ab5858e17bf2253867f548b24c47eb49
+Subproject commit d31bdb7ac597bc75fb3252cb49edccfce7eb4000
diff --git a/ccpp/set_compilers.sh b/ccpp/set_compilers.sh
index 8efe19dfe..23143a672 100755
--- a/ccpp/set_compilers.sh
+++ b/ccpp/set_compilers.sh
@@ -74,14 +74,6 @@ case "$MACHINE_ID" in
             export F77=mpif77
             export F90=mpif90
             ;;
-        cheyenne.pgi)
-            export CPP="mpicc -E"
-            export CC=mpicc
-            export CXX=mpicxx
-            export FC=mpif90
-            export F77=mpif77
-            export F90=mpif90
-            ;;
         endeavor.intel)
             export CC=mpiicc
             export CXX=mpiicpc