diff --git a/CMakeLists.txt b/CMakeLists.txt
index c9da12e6ad..f2bd098f20 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,6 +16,12 @@ set(PROJECT_VCS_URL "https://github.com/sogno-platform/dpsim")
 if(POLICY CMP0076)
 	cmake_policy(SET CMP0076 NEW)
 endif()
+
+# Solve DOWNLOAD_EXTRACT_TIMESTAMP warning
+if(POLICY CMP0135)
+	cmake_policy(SET CMP0135 NEW)
+endif()
+
 # Allow setting Graphviz_ROOT for windows builds
 if(WIN32)
 	cmake_policy(SET CMP0074 NEW)
diff --git a/dpsim-models/CMakeLists.txt b/dpsim-models/CMakeLists.txt
index 8bf19e39ca..8f18461ec0 100644
--- a/dpsim-models/CMakeLists.txt
+++ b/dpsim-models/CMakeLists.txt
@@ -13,7 +13,6 @@ set(MODELS_LIBRARIES
 	Threads::Threads
 	Eigen3::Eigen
 	spdlog::spdlog
-	klu
 )
 
 add_subdirectory(src)
diff --git a/dpsim-models/src/CMakeLists.txt b/dpsim-models/src/CMakeLists.txt
index 30639f8dad..79334c602c 100644
--- a/dpsim-models/src/CMakeLists.txt
+++ b/dpsim-models/src/CMakeLists.txt
@@ -170,11 +170,6 @@ if(WITH_GSL)
 	list(APPEND MODELS_LIBRARIES ${GSL_LIBRARIES})
 endif()
 
-if(WITH_KLU)
-	list(APPEND MODELS_INCLUDE_DIRS ${KLU_INCLUDE_DIRS})
-	list(APPEND MODELS_LIBRARIES ${KLU_LIBRARIES})
-endif()
-
 target_link_libraries(dpsim-models PUBLIC ${MODELS_LIBRARIES})
 target_include_directories(dpsim-models PUBLIC ${MODELS_INCLUDE_DIRS})
 target_sources(dpsim-models PRIVATE ${MODELS_SOURCES})
diff --git a/dpsim/examples/cxx/CMakeLists.txt b/dpsim/examples/cxx/CMakeLists.txt
index 504490cc76..dba9ec1117 100644
--- a/dpsim/examples/cxx/CMakeLists.txt
+++ b/dpsim/examples/cxx/CMakeLists.txt
@@ -214,21 +214,11 @@ if(WITH_CIM)
 	endif()
 endif()
 
-if(WITH_PYBIND)
-	#list(APPEND LIBRARIES ${PYTHON_LIBRARIES})
-	list(APPEND INCLUDE_DIRS ${Python_INCLUDE_DIRS})
-endif()
-
 if(WITH_OPENMP)
 	list(APPEND DPSIM_CXX_FLAGS ${OpenMP_CXX_FLAGS})
 	list(APPEND LIBRARIES ${OpenMP_CXX_FLAGS})
 endif()
 
-if(WITH_KLU)
-	list(APPEND INCLUDE_DIRS ${KLU_INCLUDE_DIR})
-	list(APPEND LIBRARIES ${KLU_LIBRARIES})
-endif()
-
 add_custom_target(tests)
 
 foreach(SOURCE ${CIRCUIT_SOURCES} ${SYNCGEN_SOURCES} ${VARFREQ_SOURCES} ${RT_SOURCES} ${CIM_SOURCES} ${CIM_SOURCES_POSIX} ${DAE_SOURCES} ${INVERTER_SOURCES})
diff --git a/dpsim/src/CMakeLists.txt b/dpsim/src/CMakeLists.txt
index 195dc5c08e..0f0460a280 100644
--- a/dpsim/src/CMakeLists.txt
+++ b/dpsim/src/CMakeLists.txt
@@ -55,6 +55,7 @@ if(WITH_JSON)
 endif()
 
 if(WITH_KLU)
+	list(APPEND DPSIM_LIBRARIES klu)
 	list(APPEND DPSIM_SOURCES
 		KLUAdapter.cpp
 	)