diff --git a/CMakeLists.txt b/CMakeLists.txt
index 83bc5ccbb6..9e1cc15501 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -350,23 +350,6 @@ add_test(
     COMMAND pytest ${COV_OPTION} ${PROJECT_SOURCE_DIR}/tests/test_saved_analysis.py
     WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
 
-# if(EXISTS ${PROJECT_SOURCE_DIR}/src/mibench/roofline/roofline.cpp) message(STATUS
-# "Enabling optional roofline binaries..") foreach(ROCM_VERSION ${ROCM_VERSIONS})
-# externalproject_add( roofline-rocm-${ROCM_VERSION} PREFIX
-# ${PROJECT_BINARY_DIR}/rocm-${ROCM_VERSION}/roofline SOURCE_DIR
-# ${PROJECT_SOURCE_DIR}/src/mibench/roofline BINARY_DIR
-# ${PROJECT_BINARY_DIR}/rocm-${ROCM_VERSION}/roofline/build BUILD_BYPRODUCTS
-# <BINARY_DIR>/roofline CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env
-# HIP_PATH=/opt/rocm-${ROCM_VERSION} ${CMAKE_COMMAND}
-# -DCMAKE_CXX_COMPILER=/opt/rocm-${ROCM_VERSION}/hip/bin/hipcc
-# -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -B <BINARY_DIR> <SOURCE_DIR> BUILD_COMMAND
-# ${CMAKE_COMMAND} --build <BINARY_DIR> --target all INSTALL_COMMAND "") #
-# add_dependencies(roofline-rocm-${ROCM_VERSION} run-pyinstaller) string(REGEX REPLACE
-# "([0-9]+)\.([0-9]+)\.([0-9]+)(.*)" "\\1.\\2" ROCM_BASIC_VERSION "${ROCM_VERSION}")
-# install( PROGRAMS ${PROJECT_BINARY_DIR}/rocm-${ROCM_VERSION}/roofline/build/roofline
-# DESTINATION ${CMAKE_INSTALL_BINDIR}/utils RENAME roofline-${ROCM_BASIC_VERSION})
-# endforeach() else() message(STATUS "Optional roofline package not found") endif()
-
 # ---------
 # Install
 # ---------
@@ -406,53 +389,14 @@ install(
     DIRECTORY src/omniperf_profile
     TYPE BIN
     PATTERN "__pycache__" EXCLUDE)
-
 # samples
 install(DIRECTORY sample TYPE DATA)
-
 # modulefile
 install(
     FILES
         ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/modulefiles/${PROJECT_NAME}/${OMNIPERF_FULL_VERSION}.lua
     DESTINATION ${MOD_INSTALL_PATH}/${PROJECT_NAME})
 
-# install(PROGRAMS src/omniperf.py DESTINATION ${OMNIPERF_PYINSTALLER_PATH})
-# set(OMNIPERF_BUILD_ARGS "-y --workpath=${PROJECT_BINARY_DIR}/pyinstaller
-# --distpath=${PROJECT_BINARY_DIR}/dist" CACHE STRING "Arguments for build.sh" FORCE)
-#
-# string(REPLACE " " ";" _OMNIPERF_BUILD_ARGS "${OMNIPERF_BUILD_ARGS}")
-#
-# add_custom_target( run-pyinstaller COMMAND ${PROJECT_SOURCE_DIR}/build.sh
-# ${_OMNIPERF_BUILD_ARGS} WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} BYPRODUCTS
-# ${PROJECT_BINARY_DIR}/dist COMMENT "Running pyinstaller")
-#
-# set(OMNIPERF_PYINSTALLER_PATH
-# "${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION}/site-packages/omniperf" CACHE STRING
-# "Relative installation directory for omniperf")
-#
-# install( DIRECTORY ${PROJECT_BINARY_DIR}/dist/omniperf/ DESTINATION
-# ${OMNIPERF_PYINSTALLER_PATH} USE_SOURCE_PERMISSIONS COMPONENT pyinstaller PATTERN ".a"
-# EXCLUDE PATTERN ".git" EXCLUDE PATTERN "utils/roofline" EXCLUDE)
-#
-# install(FILES ${PROJECT_SOURCE_DIR}/VERSION DESTINATION
-# ${OMNIPERF_PYINSTALLER_PATH}/../)
-#
-# file(RELATIVE_PATH OMNIPERF_RELATIVE_PATH
-# "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}"
-# "${CMAKE_INSTALL_PREFIX}/${OMNIPERF_PYINSTALLER_PATH}")
-#
-# configure_file(${PROJECT_SOURCE_DIR}/cmake/omniperf.sh.in
-# ${PROJECT_BINARY_DIR}/omniperf-sh @ONLY) install( PROGRAMS
-# ${PROJECT_BINARY_DIR}/omniperf-sh DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME omniperf)
-
-# Packaging directives set(CPACK_GENERATOR "DEB" "RPM" "TGZ") set(CPACK_PACKAGE_NAME
-# "omniperf") set(CPACK_PACKAGE_VENDOR "AMD") set(CPACK_PACKAGE_VERSION_MAJOR
-# ${PROJECT_VERSION_MAJOR}) set(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR})
-# set(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH}${OMNIPERF_VERSION_TWEAK})
-# set(CPACK_PACKAGE_CONTACT "Advanced Micro Devices Inc.")
-# set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "omniperf") set(CPACK_RESOURCE_FILE_LICENSE
-# "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
-
 # License header update(s)
 add_custom_target(
     license