diff --git a/IGC/Compiler/CISACodeGen/ShaderCodeGen.cpp b/IGC/Compiler/CISACodeGen/ShaderCodeGen.cpp
index 70d7b74f0495..98c18a11a55a 100644
--- a/IGC/Compiler/CISACodeGen/ShaderCodeGen.cpp
+++ b/IGC/Compiler/CISACodeGen/ShaderCodeGen.cpp
@@ -1852,7 +1852,6 @@ void OptimizeIR(CodeGenContext* const pContext)
             mpm.add(createSROAPass());
         }
 
-        mpm.add(new TrivialLocalMemoryOpsElimination());
         if (pContext->type == ShaderType::COMPUTE_SHADER &&
             (IGC_IS_FLAG_ENABLED(RemoveUnusedTGMFence) ||
                 pContext->getModuleMetaData()->enableRemoveUnusedTGMFence))
diff --git a/IGC/Compiler/CustomSafeOptPass.hpp b/IGC/Compiler/CustomSafeOptPass.hpp
index 20e3c2850a40..ee11e5a1add9 100644
--- a/IGC/Compiler/CustomSafeOptPass.hpp
+++ b/IGC/Compiler/CustomSafeOptPass.hpp
@@ -108,6 +108,7 @@ namespace IGC
         llvm::Value* analyzeTreeForTrunc64bto32b(const llvm::Use& OperandUse, llvm::SmallVector<llvm::BinaryOperator*, 8>& OpsToDelete);
     };
 
+    // TODO: Remove this pass as unused
     class TrivialLocalMemoryOpsElimination : public llvm::FunctionPass, public llvm::InstVisitor<TrivialLocalMemoryOpsElimination>
     {
     public: