diff --git a/rocclr/runtime/platform/program.cpp b/rocclr/runtime/platform/program.cpp
index bec2e95b82..91795b99ae 100644
--- a/rocclr/runtime/platform/program.cpp
+++ b/rocclr/runtime/platform/program.cpp
@@ -22,10 +22,6 @@ Program::~Program()
          it != itEnd; ++it) {
         delete it->second;
     }
-    for (it = devProgramsNoOpt_.begin(), itEnd = devProgramsNoOpt_.end();
-         it != itEnd; ++it) {
-        delete it->second;
-    }
 
     for (devicebinary_t::const_iterator IT = binary_.begin(), IE = binary_.end();
          IT != IE;  ++IT) {
@@ -100,7 +96,6 @@ Program::addDeviceProgram(Device& device, const void* image, size_t length, int
     if (program == NULL) {
         return CL_OUT_OF_HOST_MEMORY;
     }
-    devProgramsNoOpt_[&rootDev] = program;
 
     deviceList_.insert(&device);
     return CL_SUCCESS;
@@ -536,12 +531,8 @@ Program::clear()
         // Destroy device program
         delete sit->second;
     }
-    for (sit = devProgramsNoOpt_.begin(); sit != devProgramsNoOpt_.end(); ++sit) {
-        // Destroy device program
-        delete sit->second;
-    }
+
     devicePrograms_.clear();
-    devProgramsNoOpt_.clear();
     deviceList_.clear();
     if (symbolTable_) symbolTable_->clear();
     kernelNames_.clear();
diff --git a/rocclr/runtime/platform/program.hpp b/rocclr/runtime/platform/program.hpp
index 9db4eaed5c..16a070f4b5 100644
--- a/rocclr/runtime/platform/program.hpp
+++ b/rocclr/runtime/platform/program.hpp
@@ -88,7 +88,6 @@ private:
 
     //! The device program objects included in this program
     deviceprograms_t devicePrograms_;
-    deviceprograms_t devProgramsNoOpt_;
     devicelist_t deviceList_;
 
     std::string     programLog_;        //!< Log for parsing options, etc.