diff --git a/projects/clr/rocclr/elf/elf.cpp b/projects/clr/rocclr/elf/elf.cpp
index a4073c7e08..4b07c3dbdd 100644
--- a/projects/clr/rocclr/elf/elf.cpp
+++ b/projects/clr/rocclr/elf/elf.cpp
@@ -430,12 +430,6 @@ bool Elf::getTarget(uint16_t& machine, ElfPlatform& platform) const
     platform = CPU_PLATFORM;
     machine = mach - CPU_BASE;
   }
-#if !defined(WITH_LIGHTNING_COMPILER)
-  else if ( (mach >= CAL_FIRST) && (mach <= CAL_LAST)) {
-    platform = CAL_PLATFORM;
-    machine = mach - CAL_BASE;
-  }
-#endif // !defined(WITH_LIGHTNING_COMPILER)
   else if (mach == EM_386
       || mach == EM_HSAIL
       || mach == EM_HSAIL_64
@@ -1013,20 +1007,6 @@ bool Elf::isCALTarget(const char* p, signed char ec)
     return false;
   }
 
-#if !defined(WITH_LIGHTNING_COMPILER)
-  Elf64_Half machine;
-  if (ec == ELFCLASS32) {
-    machine = ((Elf32_Ehdr*)p)->e_machine;
-  }
-  else {
-    machine = ((Elf64_Ehdr*)p)->e_machine;
-  }
-
-  if ( (machine >= Elf::CAL_FIRST) && (machine <= Elf::CAL_LAST) ) {
-    return true;
-  }
-#endif // !defined(WITH_LIGHTNING_COMPILER)
-
   return false;
 }
 
diff --git a/projects/clr/rocclr/elf/elf.hpp b/projects/clr/rocclr/elf/elf.hpp
index 75e44d7219..1359e2efcb 100644
--- a/projects/clr/rocclr/elf/elf.hpp
+++ b/projects/clr/rocclr/elf/elf.hpp
@@ -24,10 +24,6 @@
 #include <map>
 
 #include "top.hpp"
-#if !defined(WITH_LIGHTNING_COMPILER)
-#include "caltarget.h" // using CALtargetEnum
-#endif // !defined(WITH_LIGHTNING_COMPILER)
-
 #include "elfio/elfio.hpp"
 #include <sstream>
 using amd::ELFIO::Elf64_Ehdr;
@@ -87,12 +83,6 @@ public:
     typedef enum {
         // NOTE!!! Never remove an entry or change the order.
 
-#if !defined(WITH_LIGHTNING_COMPILER)
-        //  All CAL targets are within [CAL_FIRST, CAL_LAST].
-        CAL_FIRST      = CAL_TARGET_600  + CAL_BASE,
-        CAL_LAST       = CAL_TARGET_LAST + CAL_BASE,
-#endif // !defined(WITH_LIGHTNING_COMPILER)
-
         // All CPU targets are within [CPU_FIRST, CPU_LAST]
         CPU_FIRST      = CPU_FEATURES_FIRST + CPU_BASE,
         CPU_LAST       = CPU_FEATURES_LAST  + CPU_BASE,