diff --git a/projects/clr/hipamd/Makefile b/projects/clr/hipamd/Makefile
deleted file mode 100644
index 33b43f53e9..0000000000
--- a/projects/clr/hipamd/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-#must also be specified in doxygen-input/doxy.cfg, 
-
-HIP_PATH ?= .
-HIPCC = $(HIP_PATH)/bin/hipcc
-HSA_PATH ?= /opt/hsa
-
-
-HIP_SOURCES = $(HIP_PATH)/src/hip_hcc.cpp 
-HIP_OBJECTS = $(HIP_SOURCES:.cpp=.o)
-
-$(HIP_OBJECTS): HIPCC_FLAGS += -I$(HSA_PATH)/include
-
-$(HIP_OBJECTS): 
-
-%.o:: %.cpp
-	    $(HIPCC) $(HIPCC_FLAGS) $< -c -O3 -o $@
-
-
-clean:
-	rm -f $(HIP_OBJECTS)
-
-
diff --git a/projects/clr/hipamd/RELEASE.md b/projects/clr/hipamd/RELEASE.md
index d22452b954..e5a0e61d13 100644
--- a/projects/clr/hipamd/RELEASE.md
+++ b/projects/clr/hipamd/RELEASE.md
@@ -14,6 +14,10 @@ We have attempted to document known bugs and limitations - in particular the [HI
 Stay tuned - the work for many of these features is already in-flight.
 
 Next:
+- Refactor HIP make and install system:
+    - Move to CMake.
+    - Split source into multiple modular .cpp and .h files.
+    - Create static library and link.
 - Deprecate hipDeviceGetProp, replace with hipGetDeviceProp
 - Deprecate hipMallocHost (Replace with hipHostMalloc)
 - Deprecate hipFreeHost (Replace with hipHostFree).