diff --git a/cmake/std/atdm/ATDMDevEnvSettings.cmake b/cmake/std/atdm/ATDMDevEnvSettings.cmake
index 7b28ba0dac22..67633a218860 100644
--- a/cmake/std/atdm/ATDMDevEnvSettings.cmake
+++ b/cmake/std/atdm/ATDMDevEnvSettings.cmake
@@ -284,7 +284,6 @@ ATDM_SET_CACHE(Kokkos_ENABLE_Cuda_Relocatable_Device_Code "$ENV{ATDM_CONFIG_CUDA
   CACHE BOOL)
 ATDM_SET_CACHE(Kokkos_ENABLE_Serial "$ENV{ATDM_CONFIG_Kokkos_ENABLE_Serial}" CACHE BOOL)
 ATDM_SET_CACHE(Kokkos_ENABLE_Cuda "${ATDM_USE_CUDA}" CACHE BOOL)
-ATDM_SET_CACHE(Kokkos_ENABLE_Deprecated_Code "$ENV{ATDM_CONFIG_Kokkos_ENABLE_Deprecated_Code}" CACHE BOOL)
 ATDM_SET_CACHE(Kokkos_ENABLE_CXX11_DISPATCH_LAMBDA ON CACHE BOOL)
 ATDM_SET_CACHE(Kokkos_ENABLE_Cuda_Lambda "${ATDM_USE_CUDA}" CACHE BOOL)
 ATDM_SET_CACHE(Kokkos_ENABLE_Debug_Bounds_Check "${Trilinos_ENABLE_DEBUG}" CACHE BOOL)
@@ -311,6 +310,22 @@ IF (ATDM_ENABLE_SPARC_SETTINGS)
   ATDM_SET_CACHE(Anasazi_ENABLE_RBGen ON CACHE BOOL)
 ENDIF()
 
+# Disable/hide deprecated code
+ATDM_SET_CACHE(KOKKOS_ENABLE_DEPRECATED_CODE OFF CACHE BOOL)
+ATDM_SET_CACHE(Tpetra_ENABLE_DEPRECATED_CODE OFF CACHE BOOL)
+ATDM_SET_CACHE(Belos_HIDE_DEPRECATED_CODE ON CACHE BOOL)
+ATDM_SET_CACHE(Epetra_HIDE_DEPRECATED_CODE ON CACHE BOOL)
+ATDM_SET_CACHE(Ifpack2_HIDE_DEPRECATED_CODE ON CACHE BOOL)
+ATDM_SET_CACHE(Ifpack2_ENABLE_DEPRECATED_CODE OFF CACHE BOOL)
+ATDM_SET_CACHE(MueLu_ENABLE_DEPRECATED_CODE OFF CACHE BOOL)
+ATDM_SET_CACHE(Panzer_HIDE_DEPRECATED_CODE ON CACHE BOOL)
+ATDM_SET_CACHE(Phalanx_HIDE_DEPRECATED_CODE ON CACHE BOOL)
+ATDM_SET_CACHE(RTop_HIDE_DEPRECATED_CODE ON CACHE BOOL)
+ATDM_SET_CACHE(STK_HIDE_DEPRECATED_CODE ON CACHE BOOL)
+ATDM_SET_CACHE(Teuchos_HIDE_DEPRECATED_CODE ON CACHE BOOL)
+ATDM_SET_CACHE(Thyra_HIDE_DEPRECATED_CODE ON CACHE BOOL)
+ATDM_SET_CACHE(Trios_HIDE_DEPRECATED_CODE ON CACHE BOOL)
+
 #
 # F) TPL locations and enables
 #
diff --git a/cmake/std/atdm/ats2/environment.sh b/cmake/std/atdm/ats2/environment.sh
index 204207d8577b..6c12d4a088b8 100755
--- a/cmake/std/atdm/ats2/environment.sh
+++ b/cmake/std/atdm/ats2/environment.sh
@@ -185,7 +185,6 @@ if [[ "$ATDM_CONFIG_COMPILER" == "CUDA-10.1.243_"* ]]; then
   export ATDM_CONFIG_Kokkos_ENABLE_Serial=ON
   export ATDM_CONFIG_Kokkos_ENABLE_Cuda=ON
   export ATDM_CONFIG_Kokkos_ENABLE_Cuda_Lambda=ON
-  export ATDM_CONFIG_Kokkos_ENABLE_Deprecated_Code=OFF
   export KOKKOS_NUM_DEVICES=4
 
 elif [[ "$ATDM_CONFIG_COMPILER" == "CUDA"* ]]; then
diff --git a/cmake/std/atdm/utils/unset_atdm_config_vars_environment.sh b/cmake/std/atdm/utils/unset_atdm_config_vars_environment.sh
index bd45653d2947..0a7faa071945 100644
--- a/cmake/std/atdm/utils/unset_atdm_config_vars_environment.sh
+++ b/cmake/std/atdm/utils/unset_atdm_config_vars_environment.sh
@@ -53,4 +53,3 @@ unset atdm_run_script_on_compute_node
 unset ATDM_CONFIG_COMPLETED_ENV_SETUP
 unset ATDM_CONFIG_Kokkos_ENABLE_Serial
 unset ATDM_CONFIG_Kokkos_ENABLE_Cuda
-unset ATDM_CONFIG_Kokkos_ENABLE_Deprecated_Code