diff --git a/benchmarks/bvh_driver/bvh_driver.cpp b/benchmarks/bvh_driver/bvh_driver.cpp
index 750ae2c99..5d575e743 100644
--- a/benchmarks/bvh_driver/bvh_driver.cpp
+++ b/benchmarks/bvh_driver/bvh_driver.cpp
@@ -95,8 +95,7 @@ void register_bvh_benchmarks(Spec const &spec)
 
 #ifdef KOKKOS_ENABLE_SYCL
   if (spec.backends == "all" || spec.backends == "sycl")
-    BVHBenchmarkRegistration<Kokkos::Experimental::SYCL>(spec,
-                                                         "ArborX::BVH<SYCL>");
+    BVHBenchmarkRegistration<Kokkos::SYCL>(spec, "ArborX::BVH<SYCL>");
 #else
   if (spec.backends == "sycl")
     throw std::runtime_error("SYCL backend not available!");
diff --git a/src/kokkos_ext/ArborX_KokkosExtSort.hpp b/src/kokkos_ext/ArborX_KokkosExtSort.hpp
index 9945c5635..c08263b00 100644
--- a/src/kokkos_ext/ArborX_KokkosExtSort.hpp
+++ b/src/kokkos_ext/ArborX_KokkosExtSort.hpp
@@ -150,8 +150,7 @@ void sortByKey(
 
 #if defined(KOKKOS_ENABLE_SYCL) && defined(ARBORX_ENABLE_ONEDPL)
 template <typename Keys, typename Values>
-void sortByKey(Kokkos::Experimental::SYCL const &space, Keys &keys,
-               Values &values)
+void sortByKey(Kokkos::SYCL const &space, Keys &keys, Values &values)
 {
   Kokkos::Profiling::ScopedRegion guard("ArborX::KokkosExt::sortByKey::OneDPL");
 
diff --git a/src/misc/ArborX_Vector.hpp b/src/misc/ArborX_Vector.hpp
index 0aacf5b7d..de1f8a989 100644
--- a/src/misc/ArborX_Vector.hpp
+++ b/src/misc/ArborX_Vector.hpp
@@ -97,18 +97,13 @@ Vector(T, U...) -> Vector<1 + sizeof...(U), T>;
 
 } // namespace ArborX::Details
 
-// FIXME: remove second template argument when ExperimentalHyperGeometry switch
-// happens
-template <typename Point, typename Point2,
-          typename Enable =
-              std::enable_if_t<ArborX::GeometryTraits::is_point_v<Point> &&
-                               ArborX::GeometryTraits::is_point_v<Point2>>>
+template <typename Point>
+  requires(ArborX::GeometryTraits::is_point_v<Point>)
 KOKKOS_INLINE_FUNCTION constexpr auto operator-(Point const &end,
-                                                Point2 const &begin)
+                                                Point const &begin)
 {
   namespace GT = ArborX::GeometryTraits;
   constexpr int DIM = GT::dimension_v<Point>;
-  static_assert(GT::dimension_v<Point2> == DIM);
   ArborX::Details::Vector<DIM, GT::coordinate_type_t<Point>> v;
   for (int d = 0; d < DIM; ++d)
     v[d] = end[d] - begin[d];
diff --git a/test/ArborXTest_LegacyTree.hpp b/test/ArborXTest_LegacyTree.hpp
index 32d69f214..d2bcfdc90 100644
--- a/test/ArborXTest_LegacyTree.hpp
+++ b/test/ArborXTest_LegacyTree.hpp
@@ -54,11 +54,6 @@ class LegacyValues
       expand(bounding_volume, Access::get(_primitives, i));
       return value_type{bounding_volume, (index_type)i};
     }
-#if defined(KOKKOS_COMPILER_INTEL) && (KOKKOS_COMPILER_INTEL <= 2021)
-    // FIXME_INTEL: workaround for spurious "missing return
-    // statement at end of non-void function" warning
-    return value_type{};
-#endif
   }
 
   KOKKOS_FUNCTION
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 099778895..14ee63323 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -15,7 +15,7 @@ if(Kokkos_ENABLE_HIP)
   list(APPEND ARBORX_DEVICE_TYPES Kokkos::HIPSpace::device_type)
 endif()
 if(Kokkos_ENABLE_SYCL)
-  list(APPEND ARBORX_DEVICE_TYPES Kokkos::Experimental::SYCL::device_type)
+  list(APPEND ARBORX_DEVICE_TYPES Kokkos::SYCL::device_type)
 endif()
 
 string(REPLACE ";" "," ARBORX_DEVICE_TYPES "${ARBORX_DEVICE_TYPES}")
diff --git a/test/tstMinimumSpanningTreeGoldenTest.cpp b/test/tstMinimumSpanningTreeGoldenTest.cpp
index 5394c58be..5691653e8 100644
--- a/test/tstMinimumSpanningTreeGoldenTest.cpp
+++ b/test/tstMinimumSpanningTreeGoldenTest.cpp
@@ -136,7 +136,7 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(minimum_spanning_tree_golden_test, DeviceType,
   double tol = 1.e-8;
 // FIXME_SYCL
 #ifdef KOKKOS_ENABLE_SYCL
-  if constexpr (std::is_same_v<ExecutionSpace, Kokkos::Experimental::SYCL>)
+  if constexpr (std::is_same_v<ExecutionSpace, Kokkos::SYCL>)
     tol = 1.e-7;
 #endif
   BOOST_TEST(total_weight[5] == ref_total_weight[5], tt::tolerance(tol));