diff --git a/cmake/std/sems/SEMSDevEnv.cmake b/cmake/std/sems/SEMSDevEnv.cmake
index 20cedcb049ca..3288018705d3 100644
--- a/cmake/std/sems/SEMSDevEnv.cmake
+++ b/cmake/std/sems/SEMSDevEnv.cmake
@@ -5,8 +5,6 @@
 #
 # A) Define the compilers and basic env
 #
-# NOTE: Set up different compilers depending on if MPI is enabled or not.
-#
 
 IF (TPL_ENABLE_MPI)
   # Set up MPI compiler wrappers
@@ -45,22 +43,17 @@ SET(${PROJECT_NAME}_EXTRA_LINK_FLAGS
 # Point to the right MPI
 ASSERT_DEFINED(ENV{SEMS_OPENMPI_ROOT})
 SET(MPI_BASE_DIR "$ENV{SEMS_OPENMPI_ROOT}" CACHE PATH
- "Set in SEMSDevEnv.cmake")
+  "Set in SEMSDevEnv.cmake")
 
 #
-# C) Disable packages and TPLs not supported by SEMS Dev Env
+# B) Disable packages and TPLs by default not supported by SEMS Dev Env
 #
 
 # Don't have SWIG so can't enable PyTrilinos
 SET(${PROJECT_NAME}_ENABLE_PyTrilinos OFF CACHE BOOL "Set in SEMSDevEnv.cmake")
 
-# Disable a bunch of TPLs that are not on this system
-#SET(TPL_ENABLE_GLM OFF CACHE BOOL "Set in SEMSDevEnv.cmake")
-#SET(TPL_ENABLE_Matio OFF CACHE BOOL "Set in SEMSDevEnv.cmake")
-#SET(TPL_ENABLE_X11 OFF CACHE BOOL "Set in SEMSDevEnv.cmake")
-
 #
-# D) Set up the paths to the TPL includes and libs
+# C) Set up the paths to the TPL includes and libs
 #
 
 # Define helper function for finding the serial version of a TPL of this is a
@@ -100,16 +93,11 @@ FUNCTION(SEMS_SELECT_TPL_ROOT_DIR  SEMS_TPL_NAME  TPL_ROOT_DIR_OUT)
   SET(${TPL_ROOT_DIR_OUT} "${TPL_ROOT_DIR}" PARENT_SCOPE)
 ENDFUNCTION()
 
-# BLAS
-#SET(TPL_ENABLE_BLAS ON CACHE BOOL "Set in SEMSDevEnv.cmake")
-# Above, assume BLAS is found in default path!
+# Assume BLAS is found in default path!
 
-# LAPACK
-#SET(TPL_ENABLE_LAPACK ON CACHE BOOL "Set in SEMSDevEnv.cmake")
-# Above, assume LAPACK is found in default path!
+# Assume LAPACK is found in default path!
 
 # Boost
-#SET(TPL_ENABLE_Boost ON CACHE BOOL "Set in SEMSDevEnv.cmake")
 SEMS_SELECT_TPL_ROOT_DIR(BOOST Boost_ROOT)
 #PRINT_VAR(Boost_ROOT)
 SET(Boost_INCLUDE_DIRS "${Boost_ROOT}/include"
@@ -118,18 +106,15 @@ SET(Boost_LIBRARY_DIRS "${Boost_ROOT}/lib"
   CACHE PATH "Set in SEMSDevEnv.cmake")
 
 # BoostLib
-#SET(TPL_ENABLE_BoostLib ON CACHE BOOL "Set in SEMSDevEnv.cmake")
 SET(BoostLib_INCLUDE_DIRS "${Boost_ROOT}/include"
   CACHE PATH "Set in SEMSDevEnv.cmake")
 SET(BoostLib_LIBRARY_DIRS "${Boost_ROOT}/lib"
   CACHE PATH "Set in SEMSDevEnv.cmake")
 
-
 # Scotch (SEMS only provides an MPI version)
 IF (TPL_ENABLE_MPI)
   # Disable 32-bit Scotch because it is not compatible with 64-bit ParMETIS
   # because it causes Zoltan Scotch tests to fail.
-  #SET(TPL_ENABLE_Scotch ON CACHE BOOL "Set in SEMSDevEnv.cmake")
   #SEMS_SELECT_TPL_ROOT_DIR(SCOTCH Scotch_ROOT)
   #SET(TPL_Scotch_INCLUDE_DIRS "${Scotch_ROOT}/include"
   #  CACHE PATH "Set in SEMSDevEnv.cmake")
@@ -139,7 +124,6 @@ ENDIF()
 
 # ParMETIS (SEMS only provides an MPI version)
 IF (TPL_ENABLE_MPI)
-  #SET(TPL_ENABLE_ParMETIS ON CACHE BOOL "Set in SEMSDevEnv.cmake")
   SEMS_SELECT_TPL_ROOT_DIR(PARMETIS ParMETIS_ROOT)
   #PRINT_VAR(ParMETIS_ROOT)
   SET(TPL_ParMETIS_INCLUDE_DIRS "${ParMETIS_ROOT}/include"
@@ -149,7 +133,6 @@ IF (TPL_ENABLE_MPI)
 ENDIF()
 
 # Zlib
-#SET(TPL_ENABLE_Zlib ON CACHE BOOL "Set in SEMSDevEnv.cmake")
 SEMS_SELECT_TPL_ROOT_DIR(ZLIB Zlib_ROOT)
 #PRINT_VAR(Zlib_ROOT)
 SET(TPL_Zlib_INCLUDE_DIRS "${Zlib_ROOT}/include"
@@ -160,7 +143,6 @@ SET(Zlib_LIBRARY_NAMES "z"
   CACHE STRING "Set in SEMSDevEnv.cmake")
 
 # HDF5
-#SET(TPL_ENABLE_HDF5 ON CACHE BOOL "Set in SEMSDevEnv.cmake")
 SEMS_SELECT_TPL_ROOT_DIR(HDF5 HDF5_ROOT)
 #PRINT_VAR(HDF5_ROOT)
 SET(HDF5_INCLUDE_DIRS "${HDF5_ROOT}/include;${TPL_Zlib_INCLUDE_DIRS}"
@@ -171,7 +153,6 @@ SET(HDF5_LIBRARY_NAMES "hdf5_hl;hdf5;${Zlib_LIBRARY_NAMES}"
   CACHE STRING "Set in SEMSDevEnv.cmake")
 
 # Netcdf
-#SET(TPL_ENABLE_Netcdf ON CACHE BOOL "Set in SEMSDevEnv.cmake")
 SEMS_SELECT_TPL_ROOT_DIR(NETCDF Netcdf_ROOT)
 #PRINT_VAR(Netcdf_ROOT)
 SET(TPL_Netcdf_INCLUDE_DIRS "${Netcdf_ROOT}/include;${TPL_HDF5_INCLUDE_DIRS}"
@@ -187,7 +168,6 @@ SET(Netcdf_LIBRARY_NAMES "netcdf;${SEMS_PNETCDF_LIB_STR};${HDF5_LIBRARY_NAMES}"
   CACHE STRING "Set in SEMSDevEnv.cmake")
 
 # SuperLU
-#SET(TPL_ENABLE_SuperLU ON CACHE BOOL "Set in SEMSDevEnv.cmake")
 SEMS_SELECT_TPL_ROOT_DIR(SUPERLU SuperLU_ROOT)
 #PRINT_VAR(SuperLU_ROOT)
 SET(TPL_SuperLU_INCLUDE_DIRS "${SuperLU_ROOT}/include"
@@ -196,9 +176,3 @@ SET(SuperLU_LIBRARY_DIRS "${SuperLU_ROOT}/lib"
   CACHE PATH "Set in SEMSDevEnv.cmake")
 SET(SuperLU_LIBRARY_NAMES "superlu;lapack;blas"
   CACHE STRING "Set in SEMSDevEnv.cmake")
-
-#
-# Test disables
-#
-
-# ToDo: Add test disables when needed!