diff --git a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
index 687758bb0ae..d7c94d81247 100644
--- a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
+++ b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
@@ -59,26 +59,6 @@ void ClangEditorDocumentProcessor::semanticRehighlight()
     BuiltinEditorDocumentProcessor::semanticRehighlight();
 }
 
-bool ClangEditorDocumentProcessor::hasProjectPart() const
-{
-    return !m_projectPart.isNull();
-}
-
-CppEditor::ProjectPart::ConstPtr ClangEditorDocumentProcessor::projectPart() const
-{
-    return m_projectPart;
-}
-
-void ClangEditorDocumentProcessor::clearProjectPart()
-{
-    m_projectPart.clear();
-}
-
-::Utils::Id ClangEditorDocumentProcessor::diagnosticConfigId() const
-{
-    return m_diagnosticConfigId;
-}
-
 void ClangEditorDocumentProcessor::setParserConfig(
         const CppEditor::BaseEditorDocumentParser::Configuration &config)
 {
diff --git a/src/plugins/clangcodemodel/clangeditordocumentprocessor.h b/src/plugins/clangcodemodel/clangeditordocumentprocessor.h
index aefbaa9e0ff..bd151554003 100644
--- a/src/plugins/clangcodemodel/clangeditordocumentprocessor.h
+++ b/src/plugins/clangcodemodel/clangeditordocumentprocessor.h
@@ -19,12 +19,6 @@ public:
 
     void semanticRehighlight() override;
 
-    bool hasProjectPart() const;
-    CppEditor::ProjectPart::ConstPtr projectPart() const;
-    void clearProjectPart();
-
-    ::Utils::Id diagnosticConfigId() const;
-
     void setParserConfig(const CppEditor::BaseEditorDocumentParser::Configuration &config) override;
     CppEditor::BaseEditorDocumentParser::Configuration parserConfig();
 
@@ -37,8 +31,6 @@ signals:
 
 private:
     TextEditor::TextDocument &m_document;
-    CppEditor::ProjectPart::ConstPtr m_projectPart;
-    ::Utils::Id m_diagnosticConfigId;
 };
 
 } // namespace Internal
diff --git a/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp b/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
index a14fb81b901..98e855b4195 100644
--- a/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
+++ b/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
@@ -232,9 +232,7 @@ ClangModelManagerSupport::ClangModelManagerSupport()
     connect(modelManager, &CppModelManager::abstractEditorSupportRemoved,
             this, &ClangModelManagerSupport::onAbstractEditorSupportRemoved);
     connect(modelManager, &CppModelManager::projectPartsUpdated,
-            this, &ClangModelManagerSupport::onProjectPartsUpdated);
-    connect(modelManager, &CppModelManager::projectPartsRemoved,
-            this, &ClangModelManagerSupport::onProjectPartsRemoved);
+            this, &ClangModelManagerSupport::updateLanguageClient);
     connect(modelManager, &CppModelManager::fallbackProjectPartUpdated, this, [this] {
         if (sessionModeEnabled())
             return;
@@ -861,37 +859,6 @@ void ClangModelManagerSupport::onTextMarkContextMenuRequested(TextEditor::TextEd
     }
 }
 
-using ClangEditorDocumentProcessors = QVector<ClangEditorDocumentProcessor *>;
-static ClangEditorDocumentProcessors clangProcessors()
-{
-    ClangEditorDocumentProcessors result;
-    for (const CppEditorDocumentHandle *editorDocument : cppModelManager()->cppEditorDocuments())
-        result.append(qobject_cast<ClangEditorDocumentProcessor *>(editorDocument->processor()));
-
-    return result;
-}
-
-void ClangModelManagerSupport::onProjectPartsUpdated(Project *project)
-{
-    QTC_ASSERT(project, return);
-
-    updateLanguageClient(project);
-
-    QStringList projectPartIds;
-    const ProjectInfo::ConstPtr projectInfo = cppModelManager()->projectInfo(project);
-    QTC_ASSERT(projectInfo, return);
-
-    for (const ProjectPart::ConstPtr &projectPart : projectInfo->projectParts())
-        projectPartIds.append(projectPart->id());
-    onProjectPartsRemoved(projectPartIds);
-}
-
-void ClangModelManagerSupport::onProjectPartsRemoved(const QStringList &projectPartIds)
-{
-    if (!projectPartIds.isEmpty())
-        reinitializeBackendDocuments(projectPartIds);
-}
-
 void ClangModelManagerSupport::onClangdSettingsChanged()
 {
     const bool sessionMode = sessionModeEnabled();
@@ -940,21 +907,4 @@ void ClangModelManagerSupport::onClangdSettingsChanged()
     }
 }
 
-static ClangEditorDocumentProcessors
-clangProcessorsWithProjectParts(const QStringList &projectPartIds)
-{
-    return ::Utils::filtered(clangProcessors(), [projectPartIds](ClangEditorDocumentProcessor *p) {
-        return p->hasProjectPart() && projectPartIds.contains(p->projectPart()->id());
-    });
-}
-
-void ClangModelManagerSupport::reinitializeBackendDocuments(const QStringList &projectPartIds)
-{
-    const ClangEditorDocumentProcessors processors = clangProcessorsWithProjectParts(projectPartIds);
-    for (ClangEditorDocumentProcessor *processor : processors) {
-        processor->clearProjectPart();
-        processor->run();
-    }
-}
-
 } // ClangCodeModel::Internal
diff --git a/src/plugins/clangcodemodel/clangmodelmanagersupport.h b/src/plugins/clangcodemodel/clangmodelmanagersupport.h
index 140239550d8..8121b9967a9 100644
--- a/src/plugins/clangcodemodel/clangmodelmanagersupport.h
+++ b/src/plugins/clangcodemodel/clangmodelmanagersupport.h
@@ -81,12 +81,8 @@ private:
                                         int lineNumber,
                                         QMenu *menu);
 
-    void onProjectPartsUpdated(ProjectExplorer::Project *project);
-    void onProjectPartsRemoved(const QStringList &projectPartIds);
     void onClangdSettingsChanged();
 
-    void reinitializeBackendDocuments(const QStringList &projectPartIds);
-
     void connectTextDocumentToTranslationUnit(TextEditor::TextDocument *textDocument);
     void connectToWidgetsMarkContextMenuRequested(QWidget *editorWidget);