diff --git a/projects/clr/rocclr/compiler/lib/complibdefs b/projects/clr/rocclr/compiler/lib/complibdefs
index a1ade94af4..63bb877270 100644
--- a/projects/clr/rocclr/compiler/lib/complibdefs
+++ b/projects/clr/rocclr/compiler/lib/complibdefs
@@ -23,14 +23,6 @@ ifeq ($(BUILD_LLVM_HSAIL_TARGET),yes)
 GCPPFLAGS += $(DEFSWITCH) WITH_TARGET_HSAIL
 endif
 
-ifeq ($(BUILD_LLVM_ARM_TARGET),yes)
-GCPPFLAGS += $(DEFSWITCH) WITH_TARGET_ARM
-endif
-
-ifeq ($(BUILD_LLVM_X86_TARGET),yes)
-GCPPFLAGS += $(DEFSWITCH) WITH_TARGET_X86
-endif
-
 GCPPFLAGS += $(ASIC_REG_INCS)
 GCPPFLAGS += $(INCSWITCH) "$(COMPLIB_DEPTH)"
 GCPPFLAGS += $(INCSWITCH) "$(OPENCL_DEPTH)/runtime"
diff --git a/projects/clr/rocclr/runtime/device/device.cpp b/projects/clr/rocclr/runtime/device/device.cpp
index 84657dd532..d73965a7ad 100644
--- a/projects/clr/rocclr/runtime/device/device.cpp
+++ b/projects/clr/rocclr/runtime/device/device.cpp
@@ -11,10 +11,6 @@
 extern amd::AppProfile* rocCreateAppProfile();
 #endif
 
-#if defined(WITH_CPU_DEVICE)
-#include "device/cpu/cpudevice.hpp"
-#endif  // WITH_CPU_DEVICE
-
 #if defined(WITH_PAL_DEVICE)
 // namespace pal {
 extern bool PalDeviceLoad();
@@ -176,9 +172,6 @@ bool Device::init() {
     ret |= PalDeviceLoad();
   }
 #endif  // WITH_PAL_DEVICE
-#if defined(WITH_CPU_DEVICE)
-  ret |= cpu::Device::init();
-#endif  // WITH_CPU_DEVICE
   return ret;
 }
 
@@ -203,9 +196,6 @@ void Device::tearDown() {
     PalDeviceUnload();
   }
 #endif  // WITH_PAL_DEVICE
-#if defined(WITH_CPU_DEVICE)
-  cpu::Device::tearDown();
-#endif  // WITH_CPU_DEVICE
 }
 
 Device::Device(Device* parent)