diff --git a/src/libs/3rdparty/CMakeLists.txt b/src/libs/3rdparty/CMakeLists.txt
index 0880b072495..5735446388a 100644
--- a/src/libs/3rdparty/CMakeLists.txt
+++ b/src/libs/3rdparty/CMakeLists.txt
@@ -1,4 +1,6 @@
-add_subdirectory(cplusplus)
+# OPENMV-DIFF #
+# add_subdirectory(cplusplus)
+# OPENMV-DIFF #
 add_subdirectory(syntax-highlighting)
 add_subdirectory(libvterm)
 add_subdirectory(libptyqt)
diff --git a/src/libs/CMakeLists.txt b/src/libs/CMakeLists.txt
index 9c58456685b..a2da58c7910 100644
--- a/src/libs/CMakeLists.txt
+++ b/src/libs/CMakeLists.txt
@@ -5,20 +5,20 @@ add_subdirectory(3rdparty)
 # add_subdirectory(advanceddockingsystem)
 # OPENMV-DIFF #
 add_subdirectory(aggregation)
-add_subdirectory(cplusplus)
+# OPENMV-DIFF #
+# add_subdirectory(cplusplus)
+# OPENMV-DIFF #
 add_subdirectory(extensionsystem)
 # OPENMV-DIFF #
 # add_subdirectory(glsl)
 # OPENMV-DIFF #
 add_subdirectory(languageserverprotocol)
-add_subdirectory(languageutils)
 # OPENMV-DIFF #
+# add_subdirectory(languageutils)
 # add_subdirectory(modelinglib)
 # add_subdirectory(qmldebug)
 # add_subdirectory(qmleditorwidgets)
-# OPENMV-DIFF #
-add_subdirectory(qmljs)
-# OPENMV-DIFF #
+# add_subdirectory(qmljs)
 # add_subdirectory(qtcreatorcdbext)
 # OPENMV-DIFF #
 add_subdirectory(utils)
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
index 9c82c8304c8..22312b331fc 100644
--- a/src/plugins/CMakeLists.txt
+++ b/src/plugins/CMakeLists.txt
@@ -41,9 +41,7 @@ add_subdirectory(projectexplorer)
 # add_subdirectory(cppeditor)
 # add_subdirectory(haskell)
 # add_subdirectory(help)
-# OPENMV-DIFF #
-add_subdirectory(resourceeditor)
-# OPENMV-DIFF #
+# add_subdirectory(resourceeditor)
 # add_subdirectory(nim)
 # add_subdirectory(conan)
 # add_subdirectory(saferenderer)
@@ -58,9 +56,7 @@ add_subdirectory(tabbededitor)
 # add_subdirectory(classview)
 # add_subdirectory(glsleditor)
 # add_subdirectory(modeleditor)
-# OPENMV-DIFF #
-add_subdirectory(qtsupport)
-# OPENMV-DIFF #
+# add_subdirectory(qtsupport)
 # add_subdirectory(todo)
 # add_subdirectory(vcsbase)
 # OPENMV-DIFF #
diff --git a/src/plugins/python/CMakeLists.txt b/src/plugins/python/CMakeLists.txt
index 3905a0ff51e..0a0d44e4838 100644
--- a/src/plugins/python/CMakeLists.txt
+++ b/src/plugins/python/CMakeLists.txt
@@ -1,13 +1,21 @@
 add_qtc_plugin(Python
-  DEPENDS QmlJS
-  PLUGIN_DEPENDS Core LanguageClient ProjectExplorer TextEditor QtSupport
+  # OPENMV-DIFF #
+  # DEPENDS QmlJS
+  # PLUGIN_DEPENDS Core LanguageClient ProjectExplorer TextEditor QtSupport
+  # OPENMV-DIFF #
+  PLUGIN_DEPENDS Core LanguageClient ProjectExplorer TextEditor
+  # OPENMV-DIFF #
   SOURCES
     pipsupport.cpp pipsupport.h
-    pyside.cpp pyside.h
-    pythonbuildconfiguration.cpp pythonbuildconfiguration.h
-    pysideuicextracompiler.cpp pysideuicextracompiler.h
+    # OPENMV-DIFF #
+    # pyside.cpp pyside.h
+    # pythonbuildconfiguration.cpp pythonbuildconfiguration.h
+    # pysideuicextracompiler.cpp pysideuicextracompiler.h
+    # OPENMV-DIFF #
     python.qrc
-    pythonbuildsystem.cpp pythonbuildsystem.h
+    # OPENMV-DIFF #
+    # pythonbuildsystem.cpp pythonbuildsystem.h
+    # OPENMV-DIFF #
     pythonconstants.h
     pythoneditor.cpp pythoneditor.h
     pythonformattoken.h
diff --git a/src/plugins/python/pythoneditor.cpp b/src/plugins/python/pythoneditor.cpp
index d075d784426..f21de8c2d7e 100644
--- a/src/plugins/python/pythoneditor.cpp
+++ b/src/plugins/python/pythoneditor.cpp
@@ -3,8 +3,10 @@
 
 #include "pythoneditor.h"
 
-#include "pyside.h"
-#include "pythonbuildconfiguration.h"
+// OPENMV-DIFF //
+// #include "pyside.h"
+// #include "pythonbuildconfiguration.h"
+// OPENMV-DIFF //
 #include "pythonconstants.h"
 #include "pythonhighlighter.h"
 #include "pythonindenter.h"
@@ -175,8 +177,10 @@ void PythonEditorWidget::updateInterpretersSelector()
                     && target->activeBuildConfiguration() == buildConfiguration) {
                     action->setChecked(true);
                     setButtonText(name);
-                    if (auto pbc = qobject_cast<PythonBuildConfiguration *>(buildConfiguration))
-                        m_interpreters->setToolTip(pbc->python().toUserOutput());
+                    // OPENMV-DIFF //
+                    // if (auto pbc = qobject_cast<PythonBuildConfiguration *>(buildConfiguration))
+                    //     m_interpreters->setToolTip(pbc->python().toUserOutput());
+                    // OPENMV-DIFF //
                 }
                 connect(action,
                         &QAction::triggered,
@@ -311,7 +315,9 @@ void PythonDocument::updateCurrentPython()
 void PythonDocument::updatePython(const FilePath &python)
 {
     openDocumentWithPython(python, this);
-    PySideInstaller::instance().checkPySideInstallation(python, this);
+    // OPENMV-DIFF //
+    // PySideInstaller::instance().checkPySideInstallation(python, this);
+    // OPENMV-DIFF //
     emit pythonUpdated(python);
 }
 
diff --git a/src/plugins/python/pythonplugin.cpp b/src/plugins/python/pythonplugin.cpp
index 93428569c65..95d786b4492 100644
--- a/src/plugins/python/pythonplugin.cpp
+++ b/src/plugins/python/pythonplugin.cpp
@@ -63,8 +63,10 @@ class PythonPlugin final : public ExtensionSystem::IPlugin
 
         setupPipSupport(this);
 
-        KitManager::setIrrelevantAspects(KitManager::irrelevantAspects()
-                                         + QSet<Id>{PythonKitAspect::id()});
+        // OPENMV-DIFF //
+        // KitManager::setIrrelevantAspects(KitManager::irrelevantAspects()
+        //                                  + QSet<Id>{PythonKitAspect::id()});
+        // OPENMV-DIFF //
 
         ProjectManager::registerProjectType<PythonProject>(Constants::C_PY_PROJECT_MIME_TYPE);
         ProjectManager::registerProjectType<PythonProject>(Constants::C_PY_PROJECT_MIME_TYPE_LEGACY);
diff --git a/src/plugins/python/pythonproject.cpp b/src/plugins/python/pythonproject.cpp
index ed81e8cc8bb..7e8c03f7b47 100644
--- a/src/plugins/python/pythonproject.cpp
+++ b/src/plugins/python/pythonproject.cpp
@@ -3,7 +3,9 @@
 
 #include "pythonproject.h"
 
-#include "pythonbuildsystem.h"
+// OPENMV-DIFF //
+// #include "pythonbuildsystem.h"
+// OPENMV-DIFF //
 #include "pythonconstants.h"
 #include "pythonkitaspect.h"
 #include "pythontr.h"
@@ -26,7 +28,9 @@ PythonProject::PythonProject(const FilePath &fileName)
     setProjectLanguages(Context(ProjectExplorer::Constants::PYTHON_LANGUAGE_ID));
     setDisplayName(fileName.completeBaseName());
 
-    setBuildSystemCreator([](Target *t) { return new PythonBuildSystem(t); });
+    // OPENMV-DIFF //
+    // setBuildSystemCreator([](Target *t) { return new PythonBuildSystem(t); });
+    // OPENMV-DIFF //
 }
 
 Tasks PythonProject::projectIssues(const Kit *k) const
diff --git a/src/plugins/python/pythonutils.cpp b/src/plugins/python/pythonutils.cpp
index 87156e3b9cc..e616a7bf841 100644
--- a/src/plugins/python/pythonutils.cpp
+++ b/src/plugins/python/pythonutils.cpp
@@ -3,7 +3,9 @@
 
 #include "pythonutils.h"
 
-#include "pythonbuildconfiguration.h"
+// OPENMV-DIFF //
+// #include "pythonbuildconfiguration.h"
+// OPENMV-DIFF //
 #include "pythonconstants.h"
 #include "pythonkitaspect.h"
 #include "pythonproject.h"
@@ -45,8 +47,10 @@ FilePath detectPython(const FilePath &documentPath)
 
     if (project && project->mimeType() == Constants::C_PY_PROJECT_MIME_TYPE) {
         if (const Target *target = project->activeTarget()) {
-            if (auto bc = qobject_cast<PythonBuildConfiguration *>(target->activeBuildConfiguration()))
-                return bc->python();
+            // OPENMV-DIFF //
+            // if (auto bc = qobject_cast<PythonBuildConfiguration *>(target->activeBuildConfiguration()))
+            //     return bc->python();
+            // OPENMV-DIFF //
             if (const std::optional<Interpreter> python = PythonKitAspect::python(target->kit()))
                 return python->command;
         }
diff --git a/src/shared/CMakeLists.txt b/src/shared/CMakeLists.txt
index 89493f90306..4014cc63cff 100644
--- a/src/shared/CMakeLists.txt
+++ b/src/shared/CMakeLists.txt
@@ -1,7 +1,7 @@
 # OPENMV-DIFF #
 # add_subdirectory(designerintegrationv2)
+# add_subdirectory(proparser)
 # OPENMV-DIFF #
-add_subdirectory(proparser)
 add_subdirectory(qtsingleapplication)
 # OPENMV-DIFF #
 # add_subdirectory(help)