diff --git a/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/hsa.cpp b/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/hsa.cpp
index d8604f710b..bcc1414573 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/hsa.cpp
+++ b/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/hsa.cpp
@@ -1906,10 +1906,6 @@ static std::string ConvertOldTargetNameToNew(
     NewName = "amdgcn-amd-amdhsa--gfx90c";
     xnack_supported = true;
   }
-  else if (OldName == "AMD:AMDGPU:9:4:0") {
-    NewName = "amdgcn-amd-amdhsa--gfx940";
-    xnack_supported = true;
-  }
   else {
     // Code object v2 only supports asics up to gfx906 plus gfx90c. Do NOT add
     // handling of new asics into this if-else-if* block.
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/libamdhsacode/amd_hsa_code.cpp b/projects/rocr-runtime/runtime/hsa-runtime/libamdhsacode/amd_hsa_code.cpp
index 9f4ec01af9..49412aade2 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/libamdhsacode/amd_hsa_code.cpp
+++ b/projects/rocr-runtime/runtime/hsa-runtime/libamdhsacode/amd_hsa_code.cpp
@@ -644,16 +644,6 @@ namespace code {
         mach = ELF::EF_AMDGPU_MACH_AMDGCN_GFX906;
       else if (old_name == "AMD:AMDGPU:9:0:12")
         mach = ELF::EF_AMDGPU_MACH_AMDGCN_GFX90C;
-      else if (old_name == "AMD:AMDGPU:9:4:0")
-        mach = ELF::EF_AMDGPU_MACH_AMDGCN_GFX940;
-      else if (old_name == "AMD:AMDGPU:11:0:0")
-        mach = ELF::EF_AMDGPU_MACH_AMDGCN_GFX1100;
-      else if (old_name == "AMD:AMDGPU:11:0:1")
-        mach = ELF::EF_AMDGPU_MACH_AMDGCN_GFX1101;
-      else if (old_name == "AMD:AMDGPU:11:0:2")
-        mach = ELF::EF_AMDGPU_MACH_AMDGCN_GFX1102;
-      else if (old_name == "AMD:AMDGPU:11:0:3")
-        mach = ELF::EF_AMDGPU_MACH_AMDGCN_GFX1103;
       else {
         // Code object v2 only supports asics up to gfx906 plus gfx90c. Do NOT
         // add handling of new asics into this if-else-if* block.