diff --git a/projects/clr/rocclr/runtime/device/pal/palcompiler.cpp b/projects/clr/rocclr/runtime/device/pal/palcompiler.cpp
index 17de21fdd5..f16455aea1 100644
--- a/projects/clr/rocclr/runtime/device/pal/palcompiler.cpp
+++ b/projects/clr/rocclr/runtime/device/pal/palcompiler.cpp
@@ -229,11 +229,11 @@ bool LightningProgram::compileImpl(const std::string& sourceCode,
   }
 
   // Set the options for the compiler
+  // Some options are set in Clang AMDGPUToolChain (like -m64)
   std::ostringstream ostrstr;
   std::copy(options->clangOptions.begin(), options->clangOptions.end(),
             std::ostream_iterator<std::string>(ostrstr, " "));
 
-  ostrstr << " -m" << sizeof(void*) * 8;
   std::string driverOptions(ostrstr.str());
 
   const char* xLang = options->oVariables->XLang;
@@ -241,9 +241,6 @@ bool LightningProgram::compileImpl(const std::string& sourceCode,
     buildLog_ += "Unsupported OpenCL language.\n";
   }
 
-  // FIXME_Nikolay: the program manager should be setting the language
-  // driverOptions.append(" -x cl");
-
   driverOptions.append(" -cl-std=").append(options->oVariables->CLStd);
 
   // Set the -O#
diff --git a/projects/clr/rocclr/runtime/device/rocm/roccompiler.cpp b/projects/clr/rocclr/runtime/device/rocm/roccompiler.cpp
index da821ae1ab..ab945f7206 100644
--- a/projects/clr/rocclr/runtime/device/rocm/roccompiler.cpp
+++ b/projects/clr/rocclr/runtime/device/rocm/roccompiler.cpp
@@ -71,11 +71,11 @@ bool HSAILProgram::compileImpl_LC(const std::string& sourceCode,
   }
 
   // Set the options for the compiler
+  // Some options are set in Clang AMDGPUToolChain (like -m64)
   std::ostringstream ostrstr;
   std::copy(options->clangOptions.begin(), options->clangOptions.end(),
             std::ostream_iterator<std::string>(ostrstr, " "));
 
-  ostrstr << " -m" << sizeof(void*) * 8;
   std::string driverOptions(ostrstr.str());
 
   const char* xLang = options->oVariables->XLang;
@@ -83,9 +83,6 @@ bool HSAILProgram::compileImpl_LC(const std::string& sourceCode,
     buildLog_ += "Unsupported OpenCL language.\n";
   }
 
-  // FIXME_Nikolay: the program manager should be setting the language
-  // driverOptions.append(" -x cl");
-
   driverOptions.append(" -cl-std=").append(options->oVariables->CLStd);
 
   // Set the -O#