diff --git a/runtime/hsa-runtime/inc/hsa_ext_amd.h b/runtime/hsa-runtime/inc/hsa_ext_amd.h
old mode 100755
new mode 100644
diff --git a/runtime/hsa-runtime/loader/loaders.cpp b/runtime/hsa-runtime/loader/loaders.cpp
old mode 100755
new mode 100644
index 9ee79dd323..624a8c8941
--- a/runtime/hsa-runtime/loader/loaders.cpp
+++ b/runtime/hsa-runtime/loader/loaders.cpp
@@ -87,22 +87,16 @@ namespace loader {
     gfx803.handle = 803;
     gfx804.handle = 804;
     gfx810.handle = 810;
-#if defined(GFX9_BUILD)
     gfx900.handle = 900;
     gfx901.handle = 901;
     gfx902.handle = 902;
     gfx903.handle = 903;
-    gfx904.handle = 904;
-    gfx905.handle = 905;
-    gfx906.handle = 906;
-    gfx907.handle = 907;
-#endif // GFX9_BUILD
   }
 
   hsa_isa_t OfflineLoaderContext::IsaFromName(const char *name)
   {
     std::string sname(name);
-           if (sname == "AMD:AMDGPU:7:0:0") {
+    if (sname == "AMD:AMDGPU:7:0:0") {
       return gfx700;
     } else if (sname == "AMD:AMDGPU:7:0:1") {
       return gfx701;
@@ -118,7 +112,6 @@ namespace loader {
       return gfx804;
     } else if (sname == "AMD:AMDGPU:8:1:0") {
       return gfx810;
-#if defined(GFX9_BUILD)
     } else if (sname == "AMD:AMDGPU:9:0:0") {
       return gfx900;
     } else if (sname == "AMD:AMDGPU:9:0:1") {
@@ -127,19 +120,10 @@ namespace loader {
       return gfx902;
     } else if (sname == "AMD:AMDGPU:9:0:3") {
       return gfx903;
-    } else if (sname == "AMD:AMDGPU:9:0:4") {
-      return gfx904;
-    } else if (sname == "AMD:AMDGPU:9:0:5") {
-      return gfx905;
-    } else if (sname == "AMD:AMDGPU:9:0:6") {
-      return gfx906;
-    } else if (sname == "AMD:AMDGPU:9:0:7") {
-      return gfx907;
-#endif // GFX_BUILD
-    } else {
-      assert(0);
-      return invalid;
     }
+
+    assert(0);
+    return invalid;
   }
 
   bool OfflineLoaderContext::IsaSupportedByAgent(hsa_agent_t agent, hsa_isa_t isa)
diff --git a/runtime/hsa-runtime/loader/loaders.hpp b/runtime/hsa-runtime/loader/loaders.hpp
index 81e13fbc64..94b3ceca39 100644
--- a/runtime/hsa-runtime/loader/loaders.hpp
+++ b/runtime/hsa-runtime/loader/loaders.hpp
@@ -55,11 +55,7 @@ namespace loader {
   private:
     hsa_isa_t invalid;
     hsa_isa_t gfx700, gfx701, gfx800, gfx801, gfx802, gfx803, gfx804, gfx810;
-#if defined(GFX9_BUILD)
-    hsa_isa_t gfx900, gfx901;
-#else
-    hsa_isa_t reserved;
-#endif // GFX9_BUILD
+    hsa_isa_t gfx900, gfx901, gfx902, gfx903;
     std::ostream& out;
     typedef std::set<void*> PointerSet;
     PointerSet pointers;