diff --git a/CMakeLists.txt b/CMakeLists.txt
index a10c659306ee..6d6850024e60 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -111,4 +111,28 @@ IF(${PROJECT_NAME}_ENABLE_YouCompleteMe)
   INCLUDE(CodeCompletion)
 ENDIF()
 
+set(deprecated_packages Amesos AztecOO Epetra EpetraExt Ifpack Intrepid Isorropia ML NewPackage Pliris PyTrilinos ShyLU_DDCore ThyraEpetraAdapters ThyraEpetraExtAdapters Triutils)
+set(enabled_deprecated_packages "")
+FOREACH(package ${deprecated_packages})
+  IF(Trilinos_ENABLE_${package})
+    set(enabled_deprecated_packages ${package} ${enabled_deprecated_packages})
+  ENDIF()
+ENDFOREACH()
+
+IF(enabled_deprecated_packages)
+  message("********************************************************************")
+  message("********  WARNING WARNING WARNING WARNING WARNING WARNING  *********")
+  message("********************************************************************")
+  message("* Several Trilinos packages are scheduled for deprecation in 2025.")
+  message("* The following deprecated packages are enabled (either explicitly")
+  message("* or implicitly due to a dependency)")
+  message("*")
+  string(REPLACE ";" "\n*    " p "${enabled_deprecated_packages}")
+  message("*    ${p}")
+  message("*")
+  message("********************************************************************")
+  message("")
+  message(WARNING "Deprecated packages that are enabled: ${enabled_deprecated_packages}")
+ENDIF()
+
 message(STATUS "If publishing results using Trilinos, please cite us: https://trilinos.github.io/cite.html")
diff --git a/packages/tpetra/core/compat/Tpetra_KokkosCompat_ClassicNodeAPI_Wrapper.hpp b/packages/tpetra/core/compat/Tpetra_KokkosCompat_ClassicNodeAPI_Wrapper.hpp
index a0130bc858be..427bd85bc1c5 100644
--- a/packages/tpetra/core/compat/Tpetra_KokkosCompat_ClassicNodeAPI_Wrapper.hpp
+++ b/packages/tpetra/core/compat/Tpetra_KokkosCompat_ClassicNodeAPI_Wrapper.hpp
@@ -51,14 +51,8 @@ class KokkosDeviceWrapperNode {
   static constexpr bool is_serial = false;
 #endif
 
-  //! Whether the ExecutionSpace is CPU-like (its default memory space is HostSpace or HBWSpace)
-#ifdef KOKKOS_HBWSPACE_HPP
-  static constexpr bool is_cpu =
-    std::is_same_v<typename ExecutionSpace::memory_space, Kokkos::HostSpace> ||
-    std::is_same_v<typename ExecutionSpace::memory_space, Kokkos::Experimental::HBWSpace>;
-#else
   static constexpr bool is_cpu = std::is_same_v<typename ExecutionSpace::memory_space, Kokkos::HostSpace>;
-#endif
+
   //! Whether the ExecutionSpace is GPU-like (its default memory space is not HostSpace)
   static constexpr bool is_gpu = !is_cpu;