diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4313383a3566aaf27bc32ba2ce807b28e25ef983..cdc6d8d754008ee01e3f205f94dd0cfe3b28b03c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -133,22 +133,10 @@ message(STATUS "${TADAH} VERSION: ${ver_world}.${ver_major}.${ver_minor}")
 
 add_executable (tadah bin/main.cpp bin/tadah_cli.cpp)
 
-#add_library(
-#  libtadah 
-#"${Tadah.MODELS_SOURCE_DIR}/src"
-#"${Tadah.MODELS_SOURCE_DIR}/src"
-#"${Tadah.MLIP_SOURCE_DIR}/src"
-#)
-
-#add_subdirectory(external/CLI11)
 include_directories(external/CLI11/include)
 
-
-#set_target_properties(libtadah PROPERTIES OUTPUT_NAME "tadah")
-#target_link_libraries(libtadah PUBLIC config::rc)
-
 if(TADAH_ENABLE_HPO)
-  #target_link_libraries(libtadah PUBLIC tadah.hpo)
+  target_link_libraries(tadah PUBLIC tadah.hpo)
 endif()
 
 target_include_directories(tadah PRIVATE ${Tadah.MLIP_SOURCE_DIR}/include)
@@ -163,8 +151,6 @@ if(TADAH_BUILD_MPI)
   set_target_properties(tadah PROPERTIES OUTPUT_NAME "tadah_mpi")
 endif()
 
-#target_link_libraries(tadah PRIVATE libtadah)
-
 #########################################################################
 if(TADAH_MARCH_NATIVE)
   include(CheckCXXCompilerFlag)
@@ -238,7 +224,6 @@ message(STATUS "${TADAH}: Build with Hyperparameter optimiser is ${TADAH_ENABLE_
 if(TADAH_ENABLE_OPENMP)
   find_package(OpenMP REQUIRED)
   if(OpenMP_CXX_FOUND)
-    #target_link_libraries(libtadah PUBLIC OpenMP::OpenMP_CXX)
     target_link_libraries(tadah PUBLIC OpenMP::OpenMP_CXX)
     add_compile_definitions(TADAH_ENABLE_OPENMP)
   endif()
@@ -249,19 +234,15 @@ message(STATUS "${TADAH}: Build with OpenMP is ${TADAH_ENABLE_OPENMP}")
 #########################################################################
 
 find_package(LAPACK)
-#target_link_libraries (libtadah PRIVATE ${LAPACK_LIBRARIES})
 target_link_libraries (tadah PUBLIC ${LAPACK_LIBRARIES})
 
 install(TARGETS tadah DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-#install(TARGETS libtadah DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
 
 if(TADAH_BUILD_TESTS)
   include(CTest) 
   add_subdirectory(tests)
 endif()
 
-
-
 message(STATUS "===================================================================")
 message(STATUS "                                                                   ")
 message(STATUS "${TADAH} in now configured and ready for installation.             ")
diff --git a/bin/tadah_cli.cpp b/bin/tadah_cli.cpp
index 407b6d55407b8030f2ee34146bbe5844c46b941d..bff072e15ab1224e158c73ae0259d616908d21dc 100644
--- a/bin/tadah_cli.cpp
+++ b/bin/tadah_cli.cpp
@@ -393,8 +393,7 @@ void TadahCLI::subcommand_hpo(
 #else
   CLI::Timer timer_tot {"HPO", CLI::Timer::Big};
   if (is_verbose()) std::cout << "Optimising HPs..." << std::endl;
-  int dummy_comm=0;
-  hpo_run(config, target_file, validation_file, dummy_comm);
+  hpo_run(config, target_file, validation_file);
   if (is_verbose()) std::cout << timer_tot.to_string() << std::endl;
 #endif