diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp
index b2b9c3ee096..00db6d0640d 100644
--- a/src/plugins/cpptools/cppmodelmanager.cpp
+++ b/src/plugins/cpptools/cppmodelmanager.cpp
@@ -717,8 +717,6 @@ void CppModelManager::onDocumentUpdated(Document::Ptr doc)
                     continue;
                 else if (lines.contains(m.line()))
                     continue;
-                //else if (lines.size() == MAX_SELECTION_COUNT)
-                    //break; // we're done.
 
                 lines.insert(m.line());
 
diff --git a/src/plugins/cpptools/cppmodelmanager.h b/src/plugins/cpptools/cppmodelmanager.h
index 4713c29d61b..fb645ffe8f3 100644
--- a/src/plugins/cpptools/cppmodelmanager.h
+++ b/src/plugins/cpptools/cppmodelmanager.h
@@ -168,10 +168,6 @@ private:
 
     mutable QMutex mutex;
 
-    enum {
-        MAX_SELECTION_COUNT = 5
-    };
-
     struct Editor {
         QPointer<TextEditor::BaseTextEditor> widget;
         QList<QTextEdit::ExtraSelection> selections;
diff --git a/src/plugins/cpptools/cpptoolseditorsupport.cpp b/src/plugins/cpptools/cpptoolseditorsupport.cpp
index ab6fe3532cc..a1688e7ca09 100644
--- a/src/plugins/cpptools/cpptoolseditorsupport.cpp
+++ b/src/plugins/cpptools/cpptoolseditorsupport.cpp
@@ -91,10 +91,6 @@ void CppEditorSupport::updateDocument()
         const QList<QTextEdit::ExtraSelection> selections =
                 edit->extraSelections(TextEditor::BaseTextEditor::CodeWarningsSelection);
 
-        if (! selections.isEmpty())
-            edit->setExtraSelections(TextEditor::BaseTextEditor::CodeWarningsSelection,
-                                     QList<QTextEdit::ExtraSelection>());
-
         _modelManager->stopEditorSelectionsUpdate();
     }