diff --git a/include/hip/hcc_detail/hip_runtime.h b/include/hip/hcc_detail/hip_runtime.h
index da3b7ba50e..5536ded5e2 100644
--- a/include/hip/hcc_detail/hip_runtime.h
+++ b/include/hip/hcc_detail/hip_runtime.h
@@ -50,14 +50,6 @@ THE SOFTWARE.
 #include <hip/hip_runtime_api.h>
 
 
-#if USE_PROMOTE_FREE_HCC == 1
-#define ADDRESS_SPACE_1
-#define ADDRESS_SPACE_3
-#else
-#define ADDRESS_SPACE_1 __attribute__((address_space(1)))
-#define ADDRESS_SPACE_3 __attribute__((address_space(3)))
-#endif
-
 //---
 // Remainder of this file only compiles with HCC
 #if defined __HCC__
diff --git a/src/device_util.cpp b/src/device_util.cpp
index 1efda02933..cd27ada4f5 100644
--- a/src/device_util.cpp
+++ b/src/device_util.cpp
@@ -35,8 +35,8 @@ THE SOFTWARE.
  This is the best place to put them because the device
  global variables need to be initialized at the start.
 */
-__device__ ADDRESS_SPACE_1 char gpuHeap[SIZE_OF_HEAP];
-__device__ ADDRESS_SPACE_1 uint32_t gpuFlags[NUM_PAGES];
+__device__ char gpuHeap[SIZE_OF_HEAP];
+__device__ uint32_t gpuFlags[NUM_PAGES];
 
 __device__ void *__hip_hc_malloc(size_t size)
 {
diff --git a/tests/src/deviceLib/hipTestDeviceSymbol.cpp b/tests/src/deviceLib/hipTestDeviceSymbol.cpp
index c2ffb5ce7d..2ee1e02dc0 100644
--- a/tests/src/deviceLib/hipTestDeviceSymbol.cpp
+++ b/tests/src/deviceLib/hipTestDeviceSymbol.cpp
@@ -31,16 +31,8 @@ THE SOFTWARE.
 #define NUM 1024
 #define SIZE 1024*4
 
-// TODO - collapse:
-#ifdef __HIP_PLATFORM_HCC__
-__device__ ADDRESS_SPACE_1 int globalIn[NUM];
-__device__ ADDRESS_SPACE_1 int globalOut[NUM];
-#endif
-
-#ifdef __HIP_PLATFORM_NVCC__
 __device__ int globalIn[NUM];
 __device__ int globalOut[NUM];
-#endif
 
 __global__ void Assign(hipLaunchParm lp, int* Out)
 {