diff --git a/sycl/include/sycl/device.hpp b/sycl/include/sycl/device.hpp
index 5228caca0f246..0ca1e98e11f37 100644
--- a/sycl/include/sycl/device.hpp
+++ b/sycl/include/sycl/device.hpp
@@ -234,8 +234,6 @@ class __SYCL_EXPORT device {
   template <class T>
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
 
-  friend auto detail::getDeviceComparisonLambda();
-
   template <backend BackendName, class SyclObjectT>
   friend auto get_native(const SyclObjectT &Obj)
       -> backend_return_t<BackendName, SyclObjectT>;
diff --git a/sycl/source/kernel_bundle.cpp b/sycl/source/kernel_bundle.cpp
index cc77183db286c..4443e744409a7 100644
--- a/sycl/source/kernel_bundle.cpp
+++ b/sycl/source/kernel_bundle.cpp
@@ -116,13 +116,13 @@ bool kernel_bundle_plain::is_specialization_constant_set(
 const std::vector<device>
 removeDuplicateDevices(const std::vector<device> &Devs) {
   auto compareDevices = [](device a, device b) {
-    return getSyclObjImpl(a)->getHandleRef() <
-           getSyclObjImpl(b)->getHandleRef();
+    return getSyclObjImpl(a) < getSyclObjImpl(b);
   };
   std::set<device, decltype(compareDevices)> UniqueDeviceSet(
       Devs.begin(), Devs.end(), compareDevices);
   std::vector<device> UniqueDevices(UniqueDeviceSet.begin(),
                                     UniqueDeviceSet.end());
+
   return UniqueDevices;
 }