diff --git a/main.cpp b/main.cpp
index a1b8a197..d7da6ccf 100644
--- a/main.cpp
+++ b/main.cpp
@@ -86,7 +86,7 @@ int main(int argc, char* argv[])
             runStripEnabled = false;
         } else if (argument == QByteArray("-bundle-non-qt-libs")) {
             LogDebug() << "Argument found:" << argument;
-            bundleAllButCoreLibs = true;
+            bundleAllButBlacklistedLibs = true;
         } else if (argument.startsWith(QByteArray("-verbose"))) {
             LogDebug() << "Argument found:" << argument;
             int index = argument.indexOf("=");
diff --git a/shared.cpp b/shared.cpp
index 8b76f1a9..8a712130 100644
--- a/shared.cpp
+++ b/shared.cpp
@@ -1055,7 +1055,9 @@ void runStrip(const QString &binaryPath)
     LogDebug() << "Using strip:";
     LogDebug() << " stripping" << resolvedPath;
     QProcess strip;
-    strip.setProcessEnvironment(systemEnvironment());
+    QProcessEnvironment stripEnv(systemEnvironment());
+    stripEnv.remove("LD_LIBRARY_PATH");
+    strip.setProcessEnvironment(stripEnv);
     strip.start("strip", QStringList() << resolvedPath);
     if (!strip.waitForStarted()) {
         if(strip.errorString().contains("execvp: No such file or directory")) {
diff --git a/tools/linuxdeployqt/CMakeLists.txt b/tools/linuxdeployqt/CMakeLists.txt
deleted file mode 100644
index 0016ab47..00000000
--- a/tools/linuxdeployqt/CMakeLists.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-set(CMAKE_AUTOMOC ON)
-
-set(CMAKE_CXX_STANDARD 11)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-
-# expose version data as compiler definition
-add_definitions("-DLINUXDEPLOYQT_VERSION=\"${GIT_TAG_NAME}\"")
-add_definitions("-DLINUXDEPLOYQT_GIT_COMMIT=\"${GIT_COMMIT}\"")
-add_definitions("-DBUILD_DATE=\"${DATE}\"")
-add_definitions("-DBUILD_NUMBER=\"${BUILD_NUMBER}\"")
-
-find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core)
-find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core)
-
-# update excludelist
-message(STATUS "Updating excludelist...")
-execute_process(
-    COMMAND bash ${CMAKE_CURRENT_SOURCE_DIR}/../generate-excludelist.sh
-    OUTPUT_VARIABLE EXCLUDELIST
-    TIMEOUT 10
-    RESULT_VARIABLE EXCLUDELIST_RESULT
-)
-if(NOT EXCLUDELIST_RESULT EQUAL 0)
-    message(WARNING "Updating excludelist failed, using outdated copy")
-endif()
-mark_as_advanced(EXCLUDELIST EXCLUDELIST_RESULT)
-
-add_executable(linuxdeployqt main.cpp shared.cpp)
-target_include_directories(linuxdeployqt PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
-target_link_libraries(linuxdeployqt Qt${QT_VERSION_MAJOR}::Core)
-target_compile_definitions(linuxdeployqt PRIVATE -DEXCLUDELIST="${EXCLUDELIST}")
-
-install(TARGETS linuxdeployqt RUNTIME DESTINATION ${INSTALL_RUNTIME_DIR})