diff --git a/hipamd/include/hcc_detail/hip_runtime_api.h b/hipamd/include/hcc_detail/hip_runtime_api.h
index 26c4f8ba32..85c111e8bf 100644
--- a/hipamd/include/hcc_detail/hip_runtime_api.h
+++ b/hipamd/include/hcc_detail/hip_runtime_api.h
@@ -777,7 +777,7 @@ hipError_t hipPointerGetAttributes(hipPointerAttribute_t *attributes, void* ptr)
  *
  *  @return #hipSuccess
  *
- *  @see hipMallocPitch, hipFree, hipMallocArray, hipFreeArray, hipMalloc3D, hipMalloc3DArray, hipMallocHost, hipFreeHost, hipHostAlloc
+ *  @see hipMallocPitch, hipFree, hipMallocArray, hipFreeArray, hipMalloc3D, hipMalloc3DArray, hipMallocHost, hipHostFree, hipHostAlloc
  */
 hipError_t hipMalloc(void** ptr, size_t size) ;
 
@@ -790,7 +790,7 @@ hipError_t hipMalloc(void** ptr, size_t size) ;
  *
  *  @return #hipSuccess, #hipErrorMemoryAllocation
  *
- *  @see hipMalloc, hipMallocPitch, hipMallocArray, hipMalloc3D, hipMalloc3DArray, hipHostAlloc, hipFree, hipFreeArray, hipMallocHost, hipFreeHost, hipHostAlloc
+ *  @see hipMalloc, hipMallocPitch, hipMallocArray, hipMalloc3D, hipMalloc3DArray, hipHostAlloc, hipFree, hipFreeArray, hipMallocHost, hipHostFree, hipHostAlloc
  */
 hipError_t hipMallocHost(void** ptr, size_t size) __attribute__((deprecated("use hipHostMalloc instead"))) ;
 
@@ -803,7 +803,7 @@ hipError_t hipMallocHost(void** ptr, size_t size) __attribute__((deprecated("use
  *
  *  @return #hipSuccess, #hipErrorMemoryAllocation
  *
- *  @see hipSetDeviceFlags, hipMallocHost, hipFreeHost
+ *  @see hipSetDeviceFlags, hipMallocHost, hipHostFree
  */
 hipError_t hipHostMalloc(void** ptr, size_t size, unsigned int flags) ;
 hipError_t hipHostAlloc(void** ptr, size_t size, unsigned int flags) __attribute__((deprecated("use hipHostMalloc instead"))) ;;
@@ -888,7 +888,7 @@ hipError_t hipHostUnregister(void* hostPtr) ;
  *  @param[in]  height Requested pitched allocation height
  *  @return Error code
  *
- *  @see hipMalloc, hipFree, hipMallocArray, hipFreeArray, hipMallocHost, hipFreeHost, hipMalloc3D, hipMalloc3DArray, hipHostAlloc
+ *  @see hipMalloc, hipFree, hipMallocArray, hipFreeArray, hipMallocHost, hipHostFree, hipMalloc3D, hipMalloc3DArray, hipHostAlloc
  */
 
 hipError_t hipMallocPitch(void** ptr, size_t* pitch, size_t width, size_t height);
@@ -902,24 +902,10 @@ hipError_t hipMallocPitch(void** ptr, size_t* pitch, size_t width, size_t height
  *  @return #hipSuccess
  *  @return #hipErrorInvalidDevicePointer (if pointer is invalid, including host pointers allocated with hipHostMalloc)
  *
- *  @see hipMalloc, hipMallocPitch, hipMallocArray, hipFreeArray, hipMallocHost, hipFreeHost, hipMalloc3D, hipMalloc3DArray, hipHostAlloc
+ *  @see hipMalloc, hipMallocPitch, hipMallocArray, hipFreeArray, hipMallocHost, hipHostFree, hipMalloc3D, hipMalloc3DArray, hipHostAlloc
  */
 hipError_t hipFree(void* ptr);
 
-
-
-/**
- *  @brief Free memory allocated by the hcc hip host memory allocation API.  [Deprecated.]
- *
- *  @param[in] ptr Pointer to memory to be freed
- *  @return #hipSuccess,
- *          #hipErrorInvalidValue (if pointer is invalid, including device pointers allocated with hipMalloc)
-
- *  @see hipHostFree
- */
-hipError_t hipFreeHost(void* ptr) __attribute__((deprecated("use hipHostFree instead")))  ;
-
-
 /**
  *  @brief Free memory allocated by the hcc hip host memory allocation API
  *  This API performs an implicit hipDeviceSynchronize() call.
@@ -933,8 +919,6 @@ hipError_t hipFreeHost(void* ptr) __attribute__((deprecated("use hipHostFree ins
  */
 hipError_t hipHostFree(void* ptr);
 
-
-
 /**
  *  @brief Copy data from src to dst.
  *
diff --git a/hipamd/include/nvcc_detail/hip_runtime_api.h b/hipamd/include/nvcc_detail/hip_runtime_api.h
index eff2aafe17..9d5c8d8865 100644
--- a/hipamd/include/nvcc_detail/hip_runtime_api.h
+++ b/hipamd/include/nvcc_detail/hip_runtime_api.h
@@ -205,11 +205,6 @@ inline static hipError_t hipHostUnregister(void* ptr){
 	return hipCUDAErrorTohipError(cudaHostUnregister(ptr));
 }
 
-inline static hipError_t hipFreeHost(void* ptr) __attribute__((deprecated("use hipHostFree instead")));
-inline static hipError_t hipFreeHost(void* ptr) {
-    return hipCUDAErrorTohipError(cudaFreeHost(ptr));
-}
-
 inline static hipError_t hipHostFree(void* ptr)  {
     return hipCUDAErrorTohipError(cudaFreeHost(ptr));
 }
diff --git a/hipamd/src/hip_memory.cpp b/hipamd/src/hip_memory.cpp
index b973ba977b..6381cd5332 100644
--- a/hipamd/src/hip_memory.cpp
+++ b/hipamd/src/hip_memory.cpp
@@ -941,12 +941,6 @@ hipError_t hipHostFree(void* ptr)
     return ihipLogStatus(hipStatus);
 };
 
-// TODO - deprecated function.
-hipError_t hipFreeHost(void* ptr)
-{
-    return hipHostFree(ptr);
-}
-
 hipError_t hipFreeArray(hipArray* array)
 {
     HIP_INIT_API(array);