diff --git a/rocclr/runtime/device/blitcl.cpp b/rocclr/runtime/device/blitcl.cpp
index 78000884b7..853ebab465 100644
--- a/rocclr/runtime/device/blitcl.cpp
+++ b/rocclr/runtime/device/blitcl.cpp
@@ -80,9 +80,6 @@ __kernel void fillBuffer(
 {
     __amd_fillBuffer(bufUChar, bufUInt, pattern, patternSize, offset, size);
 }
-)
-#if !defined(WITH_LIGHTNING_COMPILER)
-BLIT_KERNELS(
 extern void __amd_copyBufferToImage(
     __global uint*, __write_only image2d_array_t, ulong4,
     int4, int4, uint4, ulong4);
@@ -164,7 +161,6 @@ __kernel void fillImage(
                       origin, size, type);
 }
 )
-#endif // !defined(WITH_LIGHTNING_COMPILER)
 ;
 
 } // namespace device
diff --git a/rocclr/runtime/device/rocm/rocblit.cpp b/rocclr/runtime/device/rocm/rocblit.cpp
index c4824d8bf7..5e43543890 100644
--- a/rocclr/runtime/device/rocm/rocblit.cpp
+++ b/rocclr/runtime/device/rocm/rocblit.cpp
@@ -1509,22 +1509,21 @@ KernelBlitManager::createProgram(Device& device)
     program_ = device.blitProgram()->program_;
     program_->retain();
 
-    bool result = false;
-    do {
-        // Create kernel objects for all blits
-        for (uint i = 0; i < BlitTotal; ++i) {
-            const amd::Symbol* symbol = program_->findSymbol(BlitName[i]);
-            if (symbol == NULL) {
-                break;
-            }
-            kernels_[i] = new amd::Kernel(*program_, *symbol, BlitName[i]);
-            if (kernels_[i] == NULL) {
-                break;
-            }
-        }
+    bool result = true;
 
-        result = true;
-    } while(!result);
+    // Create kernel objects for all blits
+    for (uint i = 0; i < BlitTotal; ++i) {
+        const amd::Symbol* symbol = program_->findSymbol(BlitName[i]);
+        if (symbol == NULL) {
+            result = false;
+            continue;
+        }
+        kernels_[i] = new amd::Kernel(*program_, *symbol, BlitName[i]);
+        if (kernels_[i] == NULL) {
+            result = false;
+            continue;
+        }
+    }
 
     return result;
 }