diff --git a/sycl/include/CL/sycl/detail/common.hpp b/sycl/include/CL/sycl/detail/common.hpp
index f277f470c2e77..67eedca888f15 100644
--- a/sycl/include/CL/sycl/detail/common.hpp
+++ b/sycl/include/CL/sycl/detail/common.hpp
@@ -31,9 +31,6 @@ namespace detail {
 constexpr const char *SYCL_STREAM_NAME = "sycl";
 // Stream name being used for traces generated from the SYCL plugin layer
 constexpr const char *SYCL_PICALL_STREAM_NAME = "sycl.pi";
-// Stream name being used for traces generated from PI calls. This stream
-// contains information about function arguments.
-constexpr const char *SYCL_PIDEBUGCALL_STREAM_NAME = "sycl.pi.debug";
 // Data structure that captures the user code location information using the
 // builtin capabilities of the compiler
 struct code_location {
diff --git a/sycl/include/CL/sycl/detail/pi.def b/sycl/include/CL/sycl/detail/pi.def
index 730b4afa50c0c..5133ed2fa9210 100644
--- a/sycl/include/CL/sycl/detail/pi.def
+++ b/sycl/include/CL/sycl/detail/pi.def
@@ -14,10 +14,6 @@
 // This is for convinience of doing same thing for all interfaces, e.g.
 // declare, define, initialize.
 //
-// This list is used to define PiApiKind enum, which is part of external
-// interface. To avoid ABI breakage, please, add new entries to the end of the
-// list.
-//
 // Platform
 _PI_API(piPlatformsGet)
 _PI_API(piPlatformGetInfo)
diff --git a/sycl/include/CL/sycl/detail/pi.hpp b/sycl/include/CL/sycl/detail/pi.hpp
index a0f553309b5cf..06a72385beb55 100644
--- a/sycl/include/CL/sycl/detail/pi.hpp
+++ b/sycl/include/CL/sycl/detail/pi.hpp
@@ -184,26 +184,6 @@ uint64_t emitFunctionBeginTrace(const char *FName);
 /// \param FName The name of the PI API call
 void emitFunctionEndTrace(uint64_t CorrelationID, const char *FName);
 
-/// Notifies XPTI subscribers about PI function calls and packs call arguments.
-///
-/// \param FuncID is the API hash ID from PiApiID type trait.
-/// \param FName The name of the PI API call.
-/// \param ArgsData is a pointer to packed function call arguments.
-uint64_t emitFunctionWithArgsBeginTrace(uint32_t FuncID, const char *FName,
-                                        unsigned char *ArgsData);
-
-/// Notifies XPTI subscribers about PI function call result.
-///
-/// \param CorrelationID The correlation ID for the API call generated by the
-/// emitFunctionWithArgsBeginTrace() call.
-/// \param FuncID is the API hash ID from PiApiID type trait.
-/// \param FName The name of the PI API call.
-/// \param ArgsData is a pointer to packed function call arguments.
-/// \param Result is function call result value.
-void emitFunctionWithArgsEndTrace(uint64_t CorrelationID, uint32_t FuncID,
-                                  const char *FName, unsigned char *ArgsData,
-                                  pi_result Result);
-
 // A wrapper for passing around byte array properties
 class ByteArray {
 public:
@@ -415,5 +395,3 @@ namespace RT = cl::sycl::detail::pi;
 
 } // namespace sycl
 } // __SYCL_INLINE_NAMESPACE(cl)
-
-#undef _PI_API
diff --git a/sycl/include/CL/sycl/detail/type_traits.hpp b/sycl/include/CL/sycl/detail/type_traits.hpp
index 92955d2bfa2b2..7606a62ccb71f 100644
--- a/sycl/include/CL/sycl/detail/type_traits.hpp
+++ b/sycl/include/CL/sycl/detail/type_traits.hpp
@@ -14,7 +14,6 @@
 #include <CL/sycl/detail/type_list.hpp>
 
 #include <array>
-#include <tuple>
 #include <type_traits>
 
 __SYCL_INLINE_NAMESPACE(cl) {
@@ -351,12 +350,6 @@ template <access::address_space AS, class DataT>
 using const_if_const_AS = DataT;
 #endif
 
-template <typename T> struct function_traits {};
-
-template <typename Ret, typename... Args> struct function_traits<Ret(Args...)> {
-  using ret_type = Ret;
-  using args_type = std::tuple<Args...>;
-};
 
 } // namespace detail
 } // namespace sycl
diff --git a/sycl/source/detail/pi.cpp b/sycl/source/detail/pi.cpp
index 29172be0891b8..120801fd3fe6a 100644
--- a/sycl/source/detail/pi.cpp
+++ b/sycl/source/detail/pi.cpp
@@ -46,8 +46,6 @@ namespace detail {
 xpti_td *GSYCLGraphEvent = nullptr;
 /// Event to be used by PI layer related activities
 xpti_td *GPICallEvent = nullptr;
-/// Event to be used by PI layer calls with arguments
-xpti_td *GPIArgCallEvent = nullptr;
 /// Constants being used as placeholder until one is able to reliably get the
 /// version of the SYCL runtime
 constexpr uint32_t GMajVer = 1;
@@ -137,42 +135,6 @@ void emitFunctionEndTrace(uint64_t CorrelationID, const char *FName) {
 #endif // XPTI_ENABLE_INSTRUMENTATION
 }
 
-uint64_t emitFunctionWithArgsBeginTrace(uint32_t FuncID, const char *FuncName,
-                                        unsigned char *ArgsData) {
-  uint64_t CorrelationID = 0;
-#ifdef XPTI_ENABLE_INSTRUMENTATION
-  if (xptiTraceEnabled()) {
-    uint8_t StreamID = xptiRegisterStream(SYCL_PIDEBUGCALL_STREAM_NAME);
-    CorrelationID = xptiGetUniqueId();
-
-    xpti::function_with_args_t Payload{FuncID, FuncName, ArgsData, nullptr,
-                                       nullptr};
-
-    xptiNotifySubscribers(
-        StreamID, (uint16_t)xpti::trace_point_type_t::function_with_args_begin,
-        GPIArgCallEvent, nullptr, CorrelationID, &Payload);
-  }
-#endif
-  return CorrelationID;
-}
-
-void emitFunctionWithArgsEndTrace(uint64_t CorrelationID, uint32_t FuncID,
-                                  const char *FuncName, unsigned char *ArgsData,
-                                  pi_result Result) {
-#ifdef XPTI_ENABLE_INSTRUMENTATION
-  if (xptiTraceEnabled()) {
-    uint8_t StreamID = xptiRegisterStream(SYCL_PIDEBUGCALL_STREAM_NAME);
-
-    xpti::function_with_args_t Payload{FuncID, FuncName, ArgsData, &Result,
-                                       nullptr};
-
-    xptiNotifySubscribers(
-        StreamID, (uint16_t)xpti::trace_point_type_t::function_with_args_end,
-        GPIArgCallEvent, nullptr, CorrelationID, &Payload);
-  }
-#endif
-}
-
 void contextSetExtendedDeleter(const cl::sycl::context &context,
                                pi_context_extended_deleter func,
                                void *user_data) {
@@ -481,14 +443,6 @@ static void initializePlugins(std::vector<plugin> *Plugins) {
   GPICallEvent =
       xptiMakeEvent("PI Layer", &PIPayload, xpti::trace_algorithm_event,
                     xpti_at::active, &PiInstanceNo);
-
-  xptiInitialize(SYCL_PIDEBUGCALL_STREAM_NAME, GMajVer, GMinVer, GVerStr);
-  xpti::payload_t PIArgPayload(
-      "Plugin Interface Layer (with function arguments)");
-  uint64_t PiArgInstanceNo;
-  GPIArgCallEvent = xptiMakeEvent("PI Layer with arguments", &PIArgPayload,
-                                  xpti::trace_algorithm_event, xpti_at::active,
-                                  &PiArgInstanceNo);
 #endif
 }
 
diff --git a/sycl/source/detail/plugin.hpp b/sycl/source/detail/plugin.hpp
index 0e490c992e908..03bbb3e28ee69 100644
--- a/sycl/source/detail/plugin.hpp
+++ b/sycl/source/detail/plugin.hpp
@@ -10,7 +10,6 @@
 #include <CL/sycl/backend_types.hpp>
 #include <CL/sycl/detail/common.hpp>
 #include <CL/sycl/detail/pi.hpp>
-#include <CL/sycl/detail/type_traits.hpp>
 #include <CL/sycl/stl.hpp>
 #include <detail/plugin_printers.hpp>
 #include <memory>
@@ -26,62 +25,7 @@ namespace sycl {
 namespace detail {
 #ifdef XPTI_ENABLE_INSTRUMENTATION
 extern xpti::trace_event_data_t *GPICallEvent;
-extern xpti::trace_event_data_t *GPIArgCallEvent;
 #endif
-
-template <PiApiKind Kind, size_t Idx, typename... Args>
-struct array_fill_helper;
-
-template <PiApiKind Kind> struct PiApiArgTuple;
-
-#define _PI_API(api)                                                           \
-  template <> struct PiApiArgTuple<PiApiKind::api> {                           \
-    using type = typename function_traits<decltype(api)>::args_type;           \
-  };
-
-#include <CL/sycl/detail/pi.def>
-#undef _PI_API
-
-template <PiApiKind Kind, size_t Idx, typename T>
-struct array_fill_helper<Kind, Idx, T> {
-  static void fill(unsigned char *Dst, T &&Arg) {
-    using ArgsTuple = typename PiApiArgTuple<Kind>::type;
-    // C-style cast is required here.
-    auto RealArg = (std::tuple_element_t<Idx, ArgsTuple>)(Arg);
-    *(std::remove_cv_t<std::tuple_element_t<Idx, ArgsTuple>> *)Dst = RealArg;
-  }
-};
-
-template <PiApiKind Kind, size_t Idx, typename T, typename... Args>
-struct array_fill_helper<Kind, Idx, T, Args...> {
-  static void fill(unsigned char *Dst, const T &&Arg, Args &&... Rest) {
-    using ArgsTuple = typename PiApiArgTuple<Kind>::type;
-    // C-style cast is required here.
-    auto RealArg = (std::tuple_element_t<Idx, ArgsTuple>)(Arg);
-    *(std::remove_cv_t<std::tuple_element_t<Idx, ArgsTuple>> *)Dst = RealArg;
-    array_fill_helper<Kind, Idx + 1, Args...>::fill(
-        Dst + sizeof(decltype(RealArg)), std::forward<Args>(Rest)...);
-  }
-};
-
-template <typename... Ts>
-constexpr size_t totalSize(const std::tuple<Ts...> &) {
-  return (sizeof(Ts) + ...);
-}
-
-template <PiApiKind Kind, typename... ArgsT>
-auto packCallArguments(ArgsT &&... Args) {
-  using ArgsTuple = typename PiApiArgTuple<Kind>::type;
-
-  constexpr size_t TotalSize = totalSize(ArgsTuple{});
-
-  std::array<unsigned char, TotalSize> ArgsData;
-  array_fill_helper<Kind, 0, ArgsT...>::fill(ArgsData.data(),
-                                             std::forward<ArgsT>(Args)...);
-
-  return ArgsData;
-}
-
 /// The plugin class provides a unified interface to the underlying low-level
 /// runtimes for the device-agnostic SYCL runtime.
 ///
@@ -141,10 +85,6 @@ class plugin {
     // the per_instance_user_data field.
     const char *PIFnName = PiCallInfo.getFuncName();
     uint64_t CorrelationID = pi::emitFunctionBeginTrace(PIFnName);
-    auto ArgsData =
-        packCallArguments<PiApiOffset>(std::forward<ArgsT>(Args)...);
-    uint64_t CorrelationIDWithArgs = pi::emitFunctionWithArgsBeginTrace(
-        static_cast<uint32_t>(PiApiOffset), PIFnName, ArgsData.data());
 #endif
     RT::PiResult R;
     if (pi::trace(pi::TraceLevel::PI_TRACE_CALLS)) {
@@ -163,9 +103,6 @@ class plugin {
 #ifdef XPTI_ENABLE_INSTRUMENTATION
     // Close the function begin with a call to function end
     pi::emitFunctionEndTrace(CorrelationID, PIFnName);
-    pi::emitFunctionWithArgsEndTrace(CorrelationIDWithArgs,
-                                     static_cast<uint32_t>(PiApiOffset),
-                                     PIFnName, ArgsData.data(), R);
 #endif
     return R;
   }
diff --git a/sycl/tools/CMakeLists.txt b/sycl/tools/CMakeLists.txt
index a41530edb0539..85b9069eb5fd3 100644
--- a/sycl/tools/CMakeLists.txt
+++ b/sycl/tools/CMakeLists.txt
@@ -1,5 +1,4 @@
 add_subdirectory(sycl-ls)
-add_subdirectory(pi-trace)
 
 # TODO: move each tool in its own sub-directory
 add_executable(get_device_count_by_type get_device_count_by_type.cpp)
diff --git a/sycl/tools/pi-trace/CMakeLists.txt b/sycl/tools/pi-trace/CMakeLists.txt
deleted file mode 100644
index 5e81d6ee6a3d1..0000000000000
--- a/sycl/tools/pi-trace/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-add_library(pi_trace SHARED pi_trace.cpp)
-target_link_libraries(pi_trace PRIVATE xptifw)
-target_include_directories(pi_trace PRIVATE "${XPTI_SOURCE_DIR}/include")
-target_include_directories(pi_trace PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../xpti_helpers/")
-target_include_directories(pi_trace PRIVATE "${sycl_inc_dir}")
-target_include_directories(pi_trace PRIVATE "${sycl_src_dir}")
-
-if(UNIX)
-  target_link_libraries(pi_trace PRIVATE dl)
-endif()
-
-if (XPTI_ENABLE_TBB)
-  target_link_libraries(pi_trace PRIVATE tbb)
-endif()
diff --git a/sycl/tools/pi-trace/pi_trace.cpp b/sycl/tools/pi-trace/pi_trace.cpp
deleted file mode 100644
index 3fee6fd9f13e3..0000000000000
--- a/sycl/tools/pi-trace/pi_trace.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-//==----------- pi_trace.cpp.cpp -------------------------------------------==//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-/// \file pi_trace.cpp
-/// A sample XPTI subscriber to demonstrate how to collect PI function call
-/// arguments.
-
-#include "xpti_trace_framework.h"
-
-#include "pi_arguments_handler.hpp"
-
-#include <detail/plugin_printers.hpp>
-
-#include <iostream>
-#include <mutex>
-#include <string>
-#include <string_view>
-#include <thread>
-
-static uint8_t GStreamID = 0;
-std::mutex GIOMutex;
-
-sycl::xpti_helpers::PiArgumentsHandler ArgHandler;
-
-// The lone callback function we are going to use to demonstrate how to attach
-// the collector to the running executable
-XPTI_CALLBACK_API void tpCallback(uint16_t trace_type,
-                                  xpti::trace_event_data_t *parent,
-                                  xpti::trace_event_data_t *event,
-                                  uint64_t instance, const void *user_data);
-
-// Based on the documentation, every subscriber MUST implement the
-// xptiTraceInit() and xptiTraceFinish() APIs for their subscriber collector to
-// be loaded successfully.
-XPTI_CALLBACK_API void xptiTraceInit(unsigned int major_version,
-                                     unsigned int minor_version,
-                                     const char *version_str,
-                                     const char *stream_name) {
-  if (std::string_view(stream_name) == "sycl.pi.arg") {
-    GStreamID = xptiRegisterStream(stream_name);
-    xptiRegisterCallback(
-        GStreamID, (uint16_t)xpti::trace_point_type_t::function_with_args_begin,
-        tpCallback);
-    xptiRegisterCallback(
-        GStreamID, (uint16_t)xpti::trace_point_type_t::function_with_args_end,
-        tpCallback);
-
-#define _PI_API(api)                                                           \
-  ArgHandler.set##_##api([](auto &&... Args) {                                 \
-    std::cout << "---> " << #api << "("                                        \
-              << "\n";                                                         \
-    sycl::detail::pi::printArgs(Args...);                                      \
-    std::cout << ") ---> ";                                                    \
-  });
-#include <CL/sycl/detail/pi.def>
-#undef _PI_API
-  }
-}
-
-XPTI_CALLBACK_API void xptiTraceFinish(const char *stream_name) {
-  // NOP
-}
-
-XPTI_CALLBACK_API void tpCallback(uint16_t TraceType,
-                                  xpti::trace_event_data_t *Parent,
-                                  xpti::trace_event_data_t *Event,
-                                  uint64_t Instance, const void *UserData) {
-  auto Type = static_cast<xpti::trace_point_type_t>(TraceType);
-  if (Type == xpti::trace_point_type_t::function_with_args_end) {
-    // Lock while we print information
-    std::lock_guard<std::mutex> Lock(GIOMutex);
-
-    const auto *Data =
-        static_cast<const xpti::function_with_args_t *>(UserData);
-
-    ArgHandler.handle(Data->function_id, Data->args_data);
-    std::cout << *static_cast<pi_result *>(Data->ret_data) << "\n";
-  }
-}
diff --git a/sycl/tools/xpti_helpers/pi_arguments_handler.hpp b/sycl/tools/xpti_helpers/pi_arguments_handler.hpp
deleted file mode 100644
index 4cad50ba90c66..0000000000000
--- a/sycl/tools/xpti_helpers/pi_arguments_handler.hpp
+++ /dev/null
@@ -1,96 +0,0 @@
-//==---------- pi_arguments_handler.hpp - PI call arguments handler --------==//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#pragma once
-
-#include <CL/sycl/detail/pi.hpp>
-#include <CL/sycl/detail/type_traits.hpp>
-
-#include <functional>
-#include <tuple>
-
-__SYCL_INLINE_NAMESPACE(cl) {
-namespace sycl {
-namespace xpti_helpers {
-
-template <typename TupleT, size_t... Is>
-inline auto get(char *Data, const std::index_sequence<Is...> &) {
-  // Our type should be last in Is sequence
-  using TargetType =
-      typename std::tuple_element<sizeof...(Is) - 1, TupleT>::type;
-
-  // Calculate sizeof all elements before target + target element then substract
-  // sizeof target element
-  const size_t Offset =
-      (sizeof(typename std::tuple_element<Is, TupleT>::type) + ...) -
-      sizeof(TargetType);
-  return *(typename std::decay<TargetType>::type *)(Data + Offset);
-}
-
-template <typename TupleT, size_t... Is>
-inline TupleT unpack(char *Data,
-                     const std::index_sequence<Is...> & /*1..TupleSize*/) {
-  return {get<TupleT>(Data, std::make_index_sequence<Is + 1>{})...};
-}
-
-template <typename T> struct to_function {};
-
-template <typename... Args> struct to_function<std::tuple<Args...>> {
-  using type = std::function<void(Args...)>;
-};
-
-/// PiArgumentsHandler is a helper class to process incoming XPTI function call
-/// events and unpack contained arguments.
-///
-/// Usage:
-///
-/// PiArgumentsHandler provides set_<API name> member functions, that accept a
-/// lambda with the same arguments as target PI API. Use it to set up handling
-/// for particular API. By default an empty lambda is used.
-///
-/// When an event is signaled, use PiArgumentsHandler::handle() member function
-/// to process the incoming event and call necessary handler.
-///
-/// See sycl/tools/pi-trace/ for an example.
-class PiArgumentsHandler {
-public:
-  void handle(uint32_t ID, void *ArgsData) {
-#define _PI_API(api)                                                           \
-  if (ID == static_cast<uint32_t>(detail::PiApiKind::api)) {                   \
-    MHandler##_##api(ArgsData);                                                \
-    return;                                                                    \
-  }
-#include <CL/sycl/detail/pi.def>
-#undef _PI_API
-  }
-
-#define _PI_API(api)                                                           \
-  void set##_##api(                                                            \
-      const typename to_function<typename detail::function_traits<decltype(    \
-          api)>::args_type>::type &Handler) {                                  \
-    MHandler##_##api = [Handler](void *Data) {                                 \
-      using TupleT =                                                           \
-          typename detail::function_traits<decltype(api)>::args_type;          \
-      TupleT Tuple = unpack<TupleT>(                                           \
-          (char *)Data,                                                        \
-          std::make_index_sequence<std::tuple_size<TupleT>::value>{});         \
-      std::apply(Handler, Tuple);                                              \
-    };                                                                         \
-  }
-#include <CL/sycl/detail/pi.def>
-#undef _PI_API
-
-private:
-#define _PI_API(api)                                                           \
-  std::function<void(void *)> MHandler##_##api = [](void *) {};
-#include <CL/sycl/detail/pi.def>
-#undef _PI_API
-};
-} // namespace xpti_helpers
-} // namespace sycl
-} // __SYCL_INLINE_NAMESPACE(cl)
diff --git a/sycl/unittests/pi/CMakeLists.txt b/sycl/unittests/pi/CMakeLists.txt
index 53c69f5cae2fa..93a958850f9d8 100644
--- a/sycl/unittests/pi/CMakeLists.txt
+++ b/sycl/unittests/pi/CMakeLists.txt
@@ -6,12 +6,10 @@ add_sycl_unittest(PiTests OBJECT
   EnqueueMemTest.cpp
   PiMock.cpp
   PlatformTest.cpp
-  pi_arguments_handler.cpp
 )
 
 add_dependencies(PiTests sycl)
 target_include_directories(PiTests PRIVATE SYSTEM ${sycl_inc_dir})
-target_include_directories(PiTests PRIVATE ${sycl_src_dir}/../tools/xpti_helpers)
 
 if(SYCL_BUILD_PI_CUDA)
     add_subdirectory(cuda)
diff --git a/sycl/unittests/pi/pi_arguments_handler.cpp b/sycl/unittests/pi/pi_arguments_handler.cpp
deleted file mode 100644
index ce9d817b8a628..0000000000000
--- a/sycl/unittests/pi/pi_arguments_handler.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-//==------- pi_arguments_handler.cpp --- A test for XPTI PI args helper ---===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include <gtest/gtest.h>
-
-#include "pi_arguments_handler.hpp"
-
-#include <CL/sycl/detail/pi.h>
-
-#include <array>
-
-TEST(PiArgumentsHandlerTest, CanUnpackArguments) {
-  sycl::xpti_helpers::PiArgumentsHandler Handler;
-
-  const pi_uint32 NumPlatforms = 42;
-  pi_platform *Platforms = new pi_platform[NumPlatforms];
-
-  Handler.set_piPlatformsGet(
-      [&](pi_uint32 NP, pi_platform *Plts, pi_uint32 *Ret) {
-        EXPECT_EQ(NP, NumPlatforms);
-        EXPECT_EQ(Platforms, Plts);
-        EXPECT_EQ(Ret, nullptr);
-      });
-
-  constexpr size_t Size = sizeof(pi_uint32) + 2 * sizeof(void *);
-  std::array<unsigned char, Size> Data{0};
-  *reinterpret_cast<pi_uint32 *>(Data.data()) = NumPlatforms;
-  *reinterpret_cast<pi_platform **>(Data.data() + sizeof(pi_uint32)) =
-      Platforms;
-
-  uint32_t ID = static_cast<uint32_t>(sycl::detail::PiApiKind::piPlatformsGet);
-  Handler.handle(ID, Data.data());
-
-  delete[] Platforms;
-}
diff --git a/xpti/include/xpti_data_types.h b/xpti/include/xpti_data_types.h
index 82a845b51138e..7ed10832bb7c6 100644
--- a/xpti/include/xpti_data_types.h
+++ b/xpti/include/xpti_data_types.h
@@ -162,22 +162,6 @@ struct payload_t {
   }
 };
 
-/// A data structure that holds information about an API function call and its
-/// arguments.
-struct function_with_args_t {
-  /// A stable API function ID. It is a contract between the profiled system and
-  /// subscribers.
-  uint32_t function_id;
-  /// A null-terminated string, containing human-readable function name.
-  const char *function_name;
-  /// Pointer to packed function arguments.
-  void *args_data;
-  /// Pointer to the return value of the function.
-  void *ret_data;
-  /// [Provisional] Additional data, generated by the profiled system.
-  void *user_data;
-};
-
 ///  @brief Enumerator defining the global/basic trace point types
 ///  @details The frame work defines the global/basic trace point types
 ///  that are necessary for modeling parallel runtimes. A helper macro
@@ -271,10 +255,6 @@ enum class trace_point_type_t : uint16_t {
   function_end = XPTI_TRACE_POINT_END(12),
   /// Use to notify that a new metadata entry is available for a given event
   metadata = XPTI_TRACE_POINT_BEGIN(13),
-  /// Used to trace function call begin and its arguments.
-  function_with_args_begin = XPTI_TRACE_POINT_BEGIN(14),
-  /// Used to trace function call end.
-  function_with_args_end = XPTI_TRACE_POINT_END(15),
   /// Indicates that the trace point is user defined and only the tool defined
   /// for a stream will be able to handle it
   user_defined = 1 << 7
diff --git a/xptifw/src/xpti_trace_framework.cpp b/xptifw/src/xpti_trace_framework.cpp
index 9f7fef6070717..6dae0dbe81c28 100644
--- a/xptifw/src/xpti_trace_framework.cpp
+++ b/xptifw/src/xpti_trace_framework.cpp
@@ -1028,11 +1028,7 @@ class Framework {
       // to trace function calls without too much effort.
       if (!(UserData &&
             (TraceType == (uint16_t)trace_point_type_t::function_begin ||
-             TraceType == (uint16_t)trace_point_type_t::function_end ||
-             TraceType ==
-                 (uint16_t)trace_point_type_t::function_with_args_begin ||
-             TraceType ==
-                 (uint16_t)trace_point_type_t::function_with_args_end))) {
+             TraceType == (uint16_t)trace_point_type_t::function_end))) {
         return xpti::result_t::XPTI_RESULT_INVALIDARG;
       }
     }