diff --git a/scripts/templates/params.hpp.mako b/scripts/templates/params.hpp.mako
index fd6cbc4c06..863c3d37ea 100644
--- a/scripts/templates/params.hpp.mako
+++ b/scripts/templates/params.hpp.mako
@@ -136,19 +136,6 @@ template <typename T> inline void serializeTagged(std::ostream &os, const void *
 %endfor
 } // namespace ${x}_params
 
-## TODO - should be removed as part of #789
-#ifdef UR_INCLUDE_HANDLE_IMPLEMENTATION_OVERLOADS
-%for spec in specs:
-%for obj in spec['objects']:
-%if re.match(r"handle", obj['type']):
-inline std::ostream &operator<<(std::ostream &os, const struct ${th.make_type_name(n, tags, obj)}_ &){
-    return os;
-}
-%endif
-%endfor
-%endfor
-#endif
-
 %for spec in specs:
 %for obj in spec['objects']:
 ## ENUM #######################################################################
diff --git a/source/common/ur_params.hpp b/source/common/ur_params.hpp
index 51d11bfdbf..a10f054266 100644
--- a/source/common/ur_params.hpp
+++ b/source/common/ur_params.hpp
@@ -220,82 +220,6 @@ inline void serializeTagged(std::ostream &os, const void *ptr,
 
 } // namespace ur_params
 
-#ifdef UR_INCLUDE_HANDLE_IMPLEMENTATION_OVERLOADS
-inline std::ostream &operator<<(std::ostream &os,
-                                const struct ur_adapter_handle_t_ &) {
-    return os;
-}
-inline std::ostream &operator<<(std::ostream &os,
-                                const struct ur_platform_handle_t_ &) {
-    return os;
-}
-inline std::ostream &operator<<(std::ostream &os,
-                                const struct ur_device_handle_t_ &) {
-    return os;
-}
-inline std::ostream &operator<<(std::ostream &os,
-                                const struct ur_context_handle_t_ &) {
-    return os;
-}
-inline std::ostream &operator<<(std::ostream &os,
-                                const struct ur_event_handle_t_ &) {
-    return os;
-}
-inline std::ostream &operator<<(std::ostream &os,
-                                const struct ur_program_handle_t_ &) {
-    return os;
-}
-inline std::ostream &operator<<(std::ostream &os,
-                                const struct ur_kernel_handle_t_ &) {
-    return os;
-}
-inline std::ostream &operator<<(std::ostream &os,
-                                const struct ur_queue_handle_t_ &) {
-    return os;
-}
-inline std::ostream &operator<<(std::ostream &os,
-                                const struct ur_native_handle_t_ &) {
-    return os;
-}
-inline std::ostream &operator<<(std::ostream &os,
-                                const struct ur_sampler_handle_t_ &) {
-    return os;
-}
-inline std::ostream &operator<<(std::ostream &os,
-                                const struct ur_mem_handle_t_ &) {
-    return os;
-}
-inline std::ostream &operator<<(std::ostream &os,
-                                const struct ur_physical_mem_handle_t_ &) {
-    return os;
-}
-inline std::ostream &operator<<(std::ostream &os,
-                                const struct ur_usm_pool_handle_t_ &) {
-    return os;
-}
-inline std::ostream &operator<<(std::ostream &os,
-                                const struct ur_exp_image_handle_t_ &) {
-    return os;
-}
-inline std::ostream &operator<<(std::ostream &os,
-                                const struct ur_exp_image_mem_handle_t_ &) {
-    return os;
-}
-inline std::ostream &operator<<(std::ostream &os,
-                                const struct ur_exp_interop_mem_handle_t_ &) {
-    return os;
-}
-inline std::ostream &
-operator<<(std::ostream &os,
-           const struct ur_exp_interop_semaphore_handle_t_ &) {
-    return os;
-}
-inline std::ostream &
-operator<<(std::ostream &os, const struct ur_exp_command_buffer_handle_t_ &) {
-    return os;
-}
-#endif
-
 inline std::ostream &operator<<(std::ostream &os, enum ur_function_t value);
 inline std::ostream &operator<<(std::ostream &os,
                                 enum ur_structure_type_t value);
diff --git a/test/conformance/adapters/cuda/CMakeLists.txt b/test/conformance/adapters/cuda/CMakeLists.txt
index b85bc615f3..88b7576f56 100644
--- a/test/conformance/adapters/cuda/CMakeLists.txt
+++ b/test/conformance/adapters/cuda/CMakeLists.txt
@@ -17,8 +17,6 @@ add_conformance_test_with_devices_environment(adapter-cuda
 )
 target_link_libraries(test-adapter-cuda PRIVATE cudadrv ur_adapter_cuda)
 target_include_directories(test-adapter-cuda PRIVATE  ${CUDA_DIR} "${CUDA_DIR}/../../../" )
-# TODO - remove as part of #789
-target_compile_definitions(test-adapter-cuda PRIVATE UR_INCLUDE_HANDLE_IMPLEMENTATION_OVERLOADS)
 
 set_tests_properties(adapter-cuda PROPERTIES
         LABELS "conformance:cuda"
diff --git a/test/conformance/adapters/hip/CMakeLists.txt b/test/conformance/adapters/hip/CMakeLists.txt
index cf128b130c..b2791d75f1 100644
--- a/test/conformance/adapters/hip/CMakeLists.txt
+++ b/test/conformance/adapters/hip/CMakeLists.txt
@@ -13,8 +13,6 @@ add_conformance_test_with_devices_environment(adapter-hip
 )
 target_link_libraries(test-adapter-hip PRIVATE rocmdrv)
 target_include_directories(test-adapter-hip PRIVATE ${HIP_DIR} "${HIP_DIR}/../../..")
-# TODO - remove as part of #789
-target_compile_definitions(test-adapter-hip PRIVATE UR_INCLUDE_HANDLE_IMPLEMENTATION_OVERLOADS)
 
 if(UR_HIP_PLATFORM STREQUAL "AMD")
     target_compile_definitions(test-adapter-hip PRIVATE __HIP_PLATFORM_AMD__)