diff --git a/runtime/packages/hsa-ext-rocr-dev/CMakeLists.txt b/runtime/packages/hsa-ext-rocr-dev/CMakeLists.txt
index 16bed1c7cf..6816f3fa15 100644
--- a/runtime/packages/hsa-ext-rocr-dev/CMakeLists.txt
+++ b/runtime/packages/hsa-ext-rocr-dev/CMakeLists.txt
@@ -65,85 +65,32 @@ endif ()
 set ( BUILD_VERSION_STRING "${BUILD_VERSION_MAJOR}.${BUILD_VERSION_MINOR}.${BUILD_VERSION_PATCH}" )
 
 set ( PACKAGE_DIRECTORIES
-      "bin"
-      "hsa/bin"
       "hsa/lib")
 
 add_custom_command ( OUTPUT ${PACKAGE_DIRECTORIES} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-                   COMMAND mkdir -p bin
-                   COMMAND mkdir -p hsa/lib
-                   COMMAND mkdir -p hsa/bin )
+                   COMMAND mkdir -p hsa/lib )
 
 add_custom_target (create_dirs DEPENDS ${PACKAGE_DIRECTORIES} )
 
-set ( FINALIZER_NAME "libhsa-ext-finalize64" )
-set ( TOOLS_NAME     "libhsa-runtime-tools64" )
 set ( IMAGE_NAME     "libhsa-ext-image64" )
-set ( AMDHSACOD_NAME "amdhsacod" )
-set ( AMDHSAFIN_NAME "amdhsafin" )
 
-set ( FINALIZER_LIBRARY_SOURCE "${OUT_DIR}/lib/${FINALIZER_NAME}.so.${LIB_VERSION_STRING}" )
-set ( TOOLS_LIBRARY_SOURCE     "${OUT_DIR}/lib/${TOOLS_NAME}.so.${LIB_VERSION_STRING}" )
 set ( IMAGE_LIBRARY_SOURCE     "${OUT_DIR}/lib/${IMAGE_NAME}.so.${LIB_VERSION_STRING}" )
-set ( AMDHSACOD_SOURCE         "${OUT_DIR}/bin/${AMDHSACOD_NAME}" )
-set ( AMDHSAFIN_SOURCE         "${OUT_DIR}/bin/${AMDHSAFIN_NAME}" )
 
-set ( FINALIZER_LIBRARY_TARGET "${CMAKE_CURRENT_BINARY_DIR}/hsa/lib/${FINALIZER_NAME}.so.${LIB_VERSION_STRING}" )
-set ( TOOLS_LIBRARY_TARGET     "${CMAKE_CURRENT_BINARY_DIR}/hsa/lib/${TOOLS_NAME}.so.${LIB_VERSION_STRING}" )
 set ( IMAGE_LIBRARY_TARGET     "${CMAKE_CURRENT_BINARY_DIR}/hsa/lib/${IMAGE_NAME}.so.${LIB_VERSION_STRING}" )
-set ( AMDHSACOD_TARGET         "${CMAKE_CURRENT_BINARY_DIR}/hsa/bin/${AMDHSACOD_NAME}" )
-set ( AMDHSAFIN_TARGET         "${CMAKE_CURRENT_BINARY_DIR}/hsa/bin/${AMDHSAFIN_NAME}" )
 
-set ( FINALIZER_LIBRARY_SONAME "${CMAKE_CURRENT_BINARY_DIR}/hsa/lib/${FINALIZER_NAME}.so.${BUILD_VERSION_MAJOR}" )
-set ( TOOLS_LIBRARY_SONAME     "${CMAKE_CURRENT_BINARY_DIR}/hsa/lib/${TOOLS_NAME}.so.${BUILD_VERSION_MAJOR}" )
 set ( IMAGE_LIBRARY_SONAME     "${CMAKE_CURRENT_BINARY_DIR}/hsa/lib/${IMAGE_NAME}.so.${BUILD_VERSION_MAJOR}" )
-set ( AMDHSACOD_LINK           "${CMAKE_CURRENT_BINARY_DIR}/bin/${AMDHSACOD_NAME}" )
-set ( AMDHSAFIN_LINK           "${CMAKE_CURRENT_BINARY_DIR}/bin/${AMDHSAFIN_NAME}" )
-
-add_custom_command ( OUTPUT ${FINALIZER_LIBRARY_TARGET} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-                     COMMAND ${CMAKE_COMMAND} -E copy ${FINALIZER_LIBRARY_SOURCE} ${FINALIZER_LIBRARY_TARGET} )
-
-add_custom_command ( OUTPUT ${TOOLS_LIBRARY_TARGET} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-                     COMMAND ${CMAKE_COMMAND} -E copy ${TOOLS_LIBRARY_SOURCE} ${TOOLS_LIBRARY_TARGET} )
 
 add_custom_command ( OUTPUT ${IMAGE_LIBRARY_TARGET} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
                      COMMAND ${CMAKE_COMMAND} -E copy ${IMAGE_LIBRARY_SOURCE} ${IMAGE_LIBRARY_TARGET} )
 
-add_custom_command ( OUTPUT ${AMDHSACOD_TARGET} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-                     COMMAND ${CMAKE_COMMAND} -E copy ${AMDHSACOD_SOURCE} ${AMDHSACOD_TARGET} )
-
-add_custom_command ( OUTPUT ${AMDHSAFIN_TARGET} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-                     COMMAND ${CMAKE_COMMAND} -E copy ${AMDHSAFIN_SOURCE} ${AMDHSAFIN_TARGET} )
-
-add_custom_command ( OUTPUT ${FINALIZER_LIBRARY_SONAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/hsa/lib
-                     COMMAND ${CMAKE_COMMAND} -E create_symlink ${FINALIZER_NAME}.so.${VERSION_STRING} ${FINALIZER_NAME}.so.${BUILD_VERSION_MAJOR} )
-
-add_custom_command ( OUTPUT ${TOOLS_LIBRARY_SONAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/hsa/lib
-                     COMMAND ${CMAKE_COMMAND} -E create_symlink ${TOOLS_NAME}.so.${VERSION_STRING} ${TOOLS_NAME}.so.${BUILD_VERSION_MAJOR} )
-
 add_custom_command ( OUTPUT ${IMAGE_LIBRARY_SONAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/hsa/lib
                      COMMAND ${CMAKE_COMMAND} -E create_symlink ${IMAGE_NAME}.so.${VERSION_STRING} ${IMAGE_NAME}.so.${BUILD_VERSION_MAJOR} )
 
-add_custom_command ( OUTPUT ${AMDHSACOD_LINK} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin
-                     COMMAND ${CMAKE_COMMAND} -E create_symlink ../hsa/bin/${AMDHSACOD_NAME} ${AMDHSACOD_NAME} )
-
-add_custom_command ( OUTPUT ${AMDHSAFIN_LINK} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin
-                     COMMAND ${CMAKE_COMMAND} -E create_symlink ../hsa/bin/${AMDHSAFIN_NAME} ${AMDHSAFIN_NAME} )
-
 add_custom_target ( copy_targets ALL DEPENDS create_dirs
-                                        ${FINALIZER_LIBRARY_TARGET}
-                                        ${TOOLS_LIBRARY_TARGET}
                                         ${IMAGE_LIBRARY_TARGET}
-                                        ${AMDHSACOD_TARGET}
-                                        ${AMDHSAFIN_TARGET}
-                                        ${FINALIZER_LIBRARY_SONAME}
                                         ${TOOLS_LIBRARY_SONAME}
-                                        ${IMAGE_LIBRARY_SONAME}
-                                        ${AMDHSACOD_LINK}
-                                        ${AMDHSAFIN_LINK}
                                         )
 
-install ( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin/ DESTINATION bin USE_SOURCE_PERMISSIONS )
 install ( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/hsa/ DESTINATION hsa USE_SOURCE_PERMISSIONS )
 
 set ( CPACK_PACKAGE_NAME ${PROJECT_NAME} )
@@ -157,12 +104,10 @@ set ( CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/description" )
 set ( CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/copyright" )
 
 # Debian package specific variables
-# set ( CPACK_DEBIAN_PACKAGE_DEPENDS "None" )
 set ( CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://github.com/RadeonOpenCompute/ROCR-Runtime" )
 set ( CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/postinst;${CMAKE_CURRENT_SOURCE_DIR}/prerm" )
 
 # RPM package specific variables
-# set ( CPACK_RPM_PACKAGE_REQUIRES "None" )
 set ( CPACK_RPM_POST_INSTALL_SCRIPT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/rpm_post" )
 set ( CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/rpm_postun" )
 
diff --git a/runtime/packages/hsa-rocr-dev/CMakeLists.txt b/runtime/packages/hsa-rocr-dev/CMakeLists.txt
index 1f41d1d1d6..aff517b72c 100644
--- a/runtime/packages/hsa-rocr-dev/CMakeLists.txt
+++ b/runtime/packages/hsa-rocr-dev/CMakeLists.txt
@@ -92,13 +92,7 @@ set ( RUNTIME_HEADER_NAMES
       "hsa_ven_amd_aqlprofile.h"
      )
 
-set ( RUNTIME_TOOLS_HEADER_NAMES
-      "hsa_ext_profiler.h"
-      "hsa_ext_debugger.h"
-      "amd_hsa_tools_interfaces.h"
-    )
-
-set ( RUNTIME_TOOLS_INCLUDE_DIR "${HSA_CLOSED_SOURCE_ROOT}/drivers/hsa/runtime/tools/inc" )
+#set ( RUNTIME_TOOLS_INCLUDE_DIR "${HSA_CLOSED_SOURCE_ROOT}/drivers/hsa/runtime/tools/inc" )
 
 set ( TOPLEVEL_INCLUDE_LINK "${CMAKE_CURRENT_BINARY_DIR}/include/hsa" )
 
@@ -135,17 +129,6 @@ foreach ( HEADER_FILE ${RUNTIME_HEADER_NAMES} )
 
 endforeach()
 
-foreach ( HEADER_FILE ${RUNTIME_TOOLS_HEADER_NAMES} )
-
-    set ( HEADER_TARGET "${CMAKE_CURRENT_BINARY_DIR}/hsa/include/hsa/${HEADER_FILE}" )
-
-    add_custom_command( OUTPUT ${HEADER_TARGET} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-                        COMMAND ${CMAKE_COMMAND} -E copy ${RUNTIME_TOOLS_INCLUDE_DIR}/${HEADER_FILE} ${HEADER_TARGET} )
-
-    list ( APPEND RUNTIME_HEADERS ${HEADER_TARGET} )
-
-endforeach()
-
 add_custom_target (copy_headers DEPENDS ${RUNTIME_HEADERS} create_dirs)
 
 add_custom_target (copy_targets ALL DEPENDS create_dirs
@@ -160,7 +143,6 @@ add_custom_target (copy_targets ALL DEPENDS create_dirs
 install (DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/ DESTINATION include USE_SOURCE_PERMISSIONS )
 install (DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib/ DESTINATION lib USE_SOURCE_PERMISSIONS )
 install (DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/hsa/ DESTINATION hsa USE_SOURCE_PERMISSIONS )
-install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/sample DESTINATION hsa USE_SOURCE_PERMISSIONS )
 install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt DESTINATION hsa )
 install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/README.md DESTINATION hsa )