diff --git a/opencl/source/cl_device/cl_device_caps.cpp b/opencl/source/cl_device/cl_device_caps.cpp
index f8856eda16..0d32d422b5 100644
--- a/opencl/source/cl_device/cl_device_caps.cpp
+++ b/opencl/source/cl_device/cl_device_caps.cpp
@@ -217,7 +217,7 @@ void ClDevice::initializeCaps() {
         deviceExtensions += "cl_khr_pci_bus_info ";
     }
 
-    deviceExtensions += hwHelper.getExtensions(hwInfo);
+    deviceExtensions += hwHelper.getExtensions();
     deviceInfo.deviceExtensions = deviceExtensions.c_str();
 
     std::vector<std::string> exposedBuiltinKernelsVector;
diff --git a/shared/source/gen11/hw_helper_gen11.cpp b/shared/source/gen11/hw_helper_gen11.cpp
index 68c2abe74a..1b488fd67c 100644
--- a/shared/source/gen11/hw_helper_gen11.cpp
+++ b/shared/source/gen11/hw_helper_gen11.cpp
@@ -11,8 +11,6 @@
 #include "shared/source/helpers/hw_helper_bdw_and_later.inl"
 #include "shared/source/helpers/hw_helper_bdw_to_icllp.inl"
 
-#include "hw_helper_extra.inl"
-
 namespace NEO {
 typedef ICLFamily Family;
 
@@ -22,7 +20,7 @@ uint32_t HwHelperHw<Family>::getComputeUnitsUsedForScratch(const HardwareInfo *p
 }
 
 template <>
-std::string HwHelperHw<Family>::getExtensions(const HardwareInfo &hwInfo) const {
+std::string HwHelperHw<Family>::getExtensions() const {
     return "cl_intel_subgroup_local_block_io ";
 }
 
diff --git a/shared/source/gen12lp/hw_helper_gen12lp.cpp b/shared/source/gen12lp/hw_helper_gen12lp.cpp
index 60e368b5fd..c7e52755d4 100644
--- a/shared/source/gen12lp/hw_helper_gen12lp.cpp
+++ b/shared/source/gen12lp/hw_helper_gen12lp.cpp
@@ -18,7 +18,6 @@ using Family = NEO::TGLLPFamily;
 #include "shared/source/os_interface/hw_info_config.h"
 
 #include "engine_node.h"
-#include "hw_helper_extra.inl"
 
 namespace NEO {
 
@@ -197,7 +196,7 @@ void MemorySynchronizationCommands<Family>::addPipeControlWA(LinearStream &comma
 }
 
 template <>
-std::string HwHelperHw<Family>::getExtensions(const HardwareInfo &hwInfo) const {
+std::string HwHelperHw<Family>::getExtensions() const {
     return "cl_intel_subgroup_local_block_io ";
 }
 
diff --git a/shared/source/gen8/hw_helper_gen8.cpp b/shared/source/gen8/hw_helper_gen8.cpp
index 241b0bd56f..7327fe9d81 100644
--- a/shared/source/gen8/hw_helper_gen8.cpp
+++ b/shared/source/gen8/hw_helper_gen8.cpp
@@ -12,8 +12,6 @@
 #include "shared/source/helpers/hw_helper_bdw_and_later.inl"
 #include "shared/source/helpers/hw_helper_bdw_to_icllp.inl"
 
-#include "hw_helper_extra.inl"
-
 namespace NEO {
 typedef BDWFamily Family;
 
diff --git a/shared/source/gen9/hw_helper_gen9.cpp b/shared/source/gen9/hw_helper_gen9.cpp
index 2efe9293e6..83e4237474 100644
--- a/shared/source/gen9/hw_helper_gen9.cpp
+++ b/shared/source/gen9/hw_helper_gen9.cpp
@@ -11,8 +11,6 @@
 #include "shared/source/helpers/hw_helper_bdw_and_later.inl"
 #include "shared/source/helpers/hw_helper_bdw_to_icllp.inl"
 
-#include "hw_helper_extra.inl"
-
 #include <cstring>
 
 namespace NEO {
diff --git a/shared/source/helpers/CMakeLists.txt b/shared/source/helpers/CMakeLists.txt
index a9c56231ac..a3abb15c46 100644
--- a/shared/source/helpers/CMakeLists.txt
+++ b/shared/source/helpers/CMakeLists.txt
@@ -110,9 +110,8 @@ set(NEO_CORE_HELPERS
     ${CMAKE_CURRENT_SOURCE_DIR}/uint16_avx2.h
     ${CMAKE_CURRENT_SOURCE_DIR}/uint16_sse4.h
     ${CMAKE_CURRENT_SOURCE_DIR}/vec.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}/engine_group_types.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}/hw_cmds.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}/hw_helper_extra.inl
+    ${CMAKE_CURRENT_SOURCE_DIR}/definitions/${BRANCH_DIR_SUFFIX}/hw_cmds.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/definitions/${BRANCH_DIR_SUFFIX}/engine_group_types.h
     ${CMAKE_CURRENT_SOURCE_DIR}/definitions/mi_flush_args.h
     ${CMAKE_CURRENT_SOURCE_DIR}/definitions/pipe_control_args_base.h
     ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}/pipe_control_args.h
diff --git a/shared/source/helpers/definitions/hw_helper_extra.inl b/shared/source/helpers/definitions/hw_helper_extra.inl
deleted file mode 100644
index 7edb69cede..0000000000
--- a/shared/source/helpers/definitions/hw_helper_extra.inl
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright (C) 2021 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- *
- */
-
-#include "shared/source/helpers/hw_helper.h"
-
-namespace NEO {
-
-template <typename GfxFamily>
-std::string HwHelperHw<GfxFamily>::getExtraExtensions(const HardwareInfo &hwInfo) const {
-    return "";
-}
-
-} // namespace NEO
diff --git a/shared/source/helpers/hw_helper.h b/shared/source/helpers/hw_helper.h
index bc04428564..bd0e402311 100644
--- a/shared/source/helpers/hw_helper.h
+++ b/shared/source/helpers/hw_helper.h
@@ -93,7 +93,7 @@ class HwHelper {
     virtual const StackVec<size_t, 3> getDeviceSubGroupSizes() const = 0;
     virtual const StackVec<uint32_t, 6> getThreadsPerEUConfigs() const = 0;
     virtual bool getEnableLocalMemory(const HardwareInfo &hwInfo) const = 0;
-    virtual std::string getExtensions(const HardwareInfo &hwInfo) const = 0;
+    virtual std::string getExtensions() const = 0;
     virtual std::string getDeviceMemoryName() const = 0;
     static uint32_t getMaxThreadsForVfe(const HardwareInfo &hwInfo);
     virtual uint32_t getMetricsLibraryGenId() const = 0;
@@ -157,7 +157,6 @@ class HwHelper {
 
   protected:
     virtual LocalMemoryAccessMode getDefaultLocalMemoryAccessMode(const HardwareInfo &hwInfo) const = 0;
-    virtual std::string getExtraExtensions(const HardwareInfo &hwInfo) const = 0;
 
     HwHelper() = default;
 };
@@ -266,7 +265,7 @@ class HwHelperHw : public HwHelper {
 
     bool getEnableLocalMemory(const HardwareInfo &hwInfo) const override;
 
-    std::string getExtensions(const HardwareInfo &hwInfo) const override;
+    std::string getExtensions() const override;
 
     std::string getDeviceMemoryName() const override;
 
@@ -388,8 +387,6 @@ class HwHelperHw : public HwHelper {
   protected:
     LocalMemoryAccessMode getDefaultLocalMemoryAccessMode(const HardwareInfo &hwInfo) const override;
 
-    std::string getExtraExtensions(const HardwareInfo &hwInfo) const override;
-
     static const AuxTranslationMode defaultAuxTranslationMode;
     HwHelperHw() = default;
 };
diff --git a/shared/source/helpers/hw_helper_bdw_and_later.inl b/shared/source/helpers/hw_helper_bdw_and_later.inl
index 9088b81478..6672151c3b 100644
--- a/shared/source/helpers/hw_helper_bdw_and_later.inl
+++ b/shared/source/helpers/hw_helper_bdw_and_later.inl
@@ -70,7 +70,7 @@ EngineGroupType HwHelperHw<GfxFamily>::getEngineGroupType(aub_stream::EngineType
 }
 
 template <typename GfxFamily>
-std::string HwHelperHw<GfxFamily>::getExtensions(const HardwareInfo &hwInfo) const {
+std::string HwHelperHw<GfxFamily>::getExtensions() const {
     return "";
 }
 
diff --git a/shared/source/xe_hp_core/hw_helper_xe_hp_core.cpp b/shared/source/xe_hp_core/hw_helper_xe_hp_core.cpp
index b558fb6494..0dce98b40c 100644
--- a/shared/source/xe_hp_core/hw_helper_xe_hp_core.cpp
+++ b/shared/source/xe_hp_core/hw_helper_xe_hp_core.cpp
@@ -19,8 +19,6 @@ using Family = NEO::XeHpFamily;
 #include "shared/source/helpers/hw_helper_xehp_and_later.inl"
 #include "shared/source/os_interface/hw_info_config.h"
 
-#include "hw_helper_extra.inl"
-
 namespace NEO {
 template <>
 const AuxTranslationMode HwHelperHw<Family>::defaultAuxTranslationMode = AuxTranslationMode::Blit;
@@ -165,13 +163,11 @@ const StackVec<uint32_t, 6> HwHelperHw<Family>::getThreadsPerEUConfigs() const {
 }
 
 template <>
-std::string HwHelperHw<Family>::getExtensions(const HardwareInfo &hwInfo) const {
+std::string HwHelperHw<Family>::getExtensions() const {
     std::string extensions;
     extensions += "cl_intel_dot_accumulate ";
     extensions += "cl_intel_subgroup_local_block_io ";
 
-    extensions += getExtraExtensions(hwInfo);
-
     return extensions;
 }