diff --git a/shared/source/command_stream/definitions/stream_properties.inl b/shared/source/command_stream/definitions/stream_properties.inl
index 01de2aeb90..f7d1fab7d2 100644
--- a/shared/source/command_stream/definitions/stream_properties.inl
+++ b/shared/source/command_stream/definitions/stream_properties.inl
@@ -46,12 +46,10 @@ struct StateComputeModeProperties {
 
   protected:
     void clearIsDirtyExtraPerContext();
-    void clearIsDirtyExtraPerKernel();
     bool isDirtyExtra() const;
     void resetStateExtra();
 
     void setPropertiesExtraPerContext();
-    void setPropertiesExtraPerKernel();
 
     void copyPropertiesExtra(const StateComputeModeProperties &properties);
 
diff --git a/shared/source/command_stream/stream_properties.cpp b/shared/source/command_stream/stream_properties.cpp
index 339bf66f7b..7d487da353 100644
--- a/shared/source/command_stream/stream_properties.cpp
+++ b/shared/source/command_stream/stream_properties.cpp
@@ -50,7 +50,6 @@ void StateComputeModeProperties::setPropertiesAll(bool requiresCoherency, uint32
     }
 
     setPropertiesExtraPerContext();
-    setPropertiesExtraPerKernel();
 }
 
 void StateComputeModeProperties::copyPropertiesAll(const StateComputeModeProperties &properties) {
@@ -71,8 +70,6 @@ void StateComputeModeProperties::copyPropertiesGrfNumberThreadArbitration(const
     largeGrfMode.isDirty = false;
     threadArbitrationPolicy.isDirty = false;
 
-    clearIsDirtyExtraPerKernel();
-
     largeGrfMode.set(properties.largeGrfMode.value);
     threadArbitrationPolicy.set(properties.threadArbitrationPolicy.value);
 
@@ -94,7 +91,6 @@ void StateComputeModeProperties::clearIsDirty() {
     memoryAllocationForScratchAndMidthreadPreemptionBuffers.isDirty = false;
 
     clearIsDirtyExtraPerContext();
-    clearIsDirtyExtraPerKernel();
 }
 
 void StateComputeModeProperties::setCoherencyProperty(bool requiresCoherency) {
@@ -179,11 +175,9 @@ void StateComputeModeProperties::setPropertiesGrfNumberThreadArbitration(uint32_
 
     this->threadArbitrationPolicy.isDirty = false;
     this->largeGrfMode.isDirty = false;
-    clearIsDirtyExtraPerKernel();
 
     setGrfNumberProperty(numGrfRequired);
     setThreadArbitrationProperty(threadArbitrationPolicy);
-    setPropertiesExtraPerKernel();
 }
 
 void FrontEndProperties::initSupport(const RootDeviceEnvironment &rootDeviceEnvironment) {
diff --git a/shared/source/command_stream/stream_properties_extra.cpp b/shared/source/command_stream/stream_properties_extra.cpp
index d1cdd67aaa..7f3b80b40b 100644
--- a/shared/source/command_stream/stream_properties_extra.cpp
+++ b/shared/source/command_stream/stream_properties_extra.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Intel Corporation
+ * Copyright (C) 2022-2024 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -11,8 +11,6 @@ using namespace NEO;
 
 void StateComputeModeProperties::setPropertiesExtraPerContext() {
 }
-void StateComputeModeProperties::setPropertiesExtraPerKernel() {
-}
 
 void StateComputeModeProperties::copyPropertiesExtra(const StateComputeModeProperties &properties) {
 }
@@ -23,8 +21,6 @@ bool StateComputeModeProperties::isDirtyExtra() const {
 
 void StateComputeModeProperties::clearIsDirtyExtraPerContext() {
 }
-void StateComputeModeProperties::clearIsDirtyExtraPerKernel() {
-}
 
 void StateComputeModeProperties::resetStateExtra() {
 }