diff --git a/src/libs/extensionsystem/plugindetailsview.ui b/src/libs/extensionsystem/plugindetailsview.ui
index e73c9de39b0..e22d2617ac1 100644
--- a/src/libs/extensionsystem/plugindetailsview.ui
+++ b/src/libs/extensionsystem/plugindetailsview.ui
@@ -9,9 +9,6 @@
505
-
- Form
-
2
@@ -37,9 +34,6 @@
-
-
- TextLabel
-
-
@@ -54,9 +48,6 @@
-
-
- TextLabel
-
-
@@ -71,9 +62,6 @@
-
-
- TextLabel
-
-
@@ -88,9 +76,6 @@
-
-
- TextLabel
-
-
@@ -105,9 +90,6 @@
-
-
- TextLabel
-
-
@@ -122,9 +104,6 @@
-
-
- TextLabel
-
false
@@ -179,9 +158,6 @@
-
-
- TextLabel
-
-
diff --git a/src/libs/extensionsystem/pluginerrorview.ui b/src/libs/extensionsystem/pluginerrorview.ui
index 69f49e53c66..1120263eb30 100644
--- a/src/libs/extensionsystem/pluginerrorview.ui
+++ b/src/libs/extensionsystem/pluginerrorview.ui
@@ -9,9 +9,6 @@
342
-
- Form
-
2
@@ -28,9 +25,6 @@
-
-
- TextLabel
-
-
diff --git a/src/libs/extensionsystem/pluginview.ui b/src/libs/extensionsystem/pluginview.ui
index 8d9123dfbf4..a995bbe8ed7 100644
--- a/src/libs/extensionsystem/pluginview.ui
+++ b/src/libs/extensionsystem/pluginview.ui
@@ -10,9 +10,6 @@
304
-
- Form
-
2
diff --git a/src/libs/utils/filewizardpage.ui b/src/libs/utils/filewizardpage.ui
index 98d0873128f..fea35b9c5b8 100644
--- a/src/libs/utils/filewizardpage.ui
+++ b/src/libs/utils/filewizardpage.ui
@@ -10,9 +10,6 @@
68
-
- WizardPage
-
Choose the location
diff --git a/src/libs/utils/newclasswidget.ui b/src/libs/utils/newclasswidget.ui
index 14e0a6574b8..4399a850a18 100644
--- a/src/libs/utils/newclasswidget.ui
+++ b/src/libs/utils/newclasswidget.ui
@@ -2,9 +2,6 @@
Core::Utils::NewClassWidget
-
- Dialog
-
QFormLayout::ExpandingFieldsGrow
diff --git a/src/libs/utils/projectintropage.ui b/src/libs/utils/projectintropage.ui
index 05fe640306a..62efa2d9fec 100644
--- a/src/libs/utils/projectintropage.ui
+++ b/src/libs/utils/projectintropage.ui
@@ -10,9 +10,6 @@
143
-
- WizardPage
-
Introduction and project location
@@ -22,9 +19,6 @@
-
-
- TextLabel
-
true
@@ -97,9 +91,6 @@
-
-
- TextLabel
-
diff --git a/src/plugins/coreplugin/dialogs/newdialog.ui b/src/plugins/coreplugin/dialogs/newdialog.ui
index 39412407687..a21b06a8ca9 100644
--- a/src/plugins/coreplugin/dialogs/newdialog.ui
+++ b/src/plugins/coreplugin/dialogs/newdialog.ui
@@ -45,16 +45,10 @@
-
-
- TextLabel
-
-
-
- TextLabel
-
Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
diff --git a/src/plugins/coreplugin/dialogs/shortcutsettings.ui b/src/plugins/coreplugin/dialogs/shortcutsettings.ui
index 867b021f94e..2bfd9bcfafc 100644
--- a/src/plugins/coreplugin/dialogs/shortcutsettings.ui
+++ b/src/plugins/coreplugin/dialogs/shortcutsettings.ui
@@ -10,9 +10,6 @@
451
-
- Form
-
-
diff --git a/src/plugins/coreplugin/editormanager/openeditorsview.ui b/src/plugins/coreplugin/editormanager/openeditorsview.ui
index 3cfa50e7832..00962bcbec6 100644
--- a/src/plugins/coreplugin/editormanager/openeditorsview.ui
+++ b/src/plugins/coreplugin/editormanager/openeditorsview.ui
@@ -15,9 +15,6 @@
100
-
- Form
-
0
diff --git a/src/plugins/coreplugin/generalsettings.ui b/src/plugins/coreplugin/generalsettings.ui
index 84cdf128815..a863709ac09 100644
--- a/src/plugins/coreplugin/generalsettings.ui
+++ b/src/plugins/coreplugin/generalsettings.ui
@@ -10,9 +10,6 @@
236
-
- Form
-
-
diff --git a/src/plugins/cpaster/pasteselect.ui b/src/plugins/cpaster/pasteselect.ui
index 6906f135b77..6c5f99ceeec 100644
--- a/src/plugins/cpaster/pasteselect.ui
+++ b/src/plugins/cpaster/pasteselect.ui
@@ -16,9 +16,6 @@
0
-
- Dialog
-
-
diff --git a/src/plugins/cpaster/settingspage.ui b/src/plugins/cpaster/settingspage.ui
index 0a085c75bcd..dc0708205c5 100644
--- a/src/plugins/cpaster/settingspage.ui
+++ b/src/plugins/cpaster/settingspage.ui
@@ -10,9 +10,6 @@
258
-
- Form
-
-
diff --git a/src/plugins/cpptools/completionsettingspage.ui b/src/plugins/cpptools/completionsettingspage.ui
index a044376bc74..8a0d8315f82 100644
--- a/src/plugins/cpptools/completionsettingspage.ui
+++ b/src/plugins/cpptools/completionsettingspage.ui
@@ -10,9 +10,6 @@
300
-
- Form
-
-
diff --git a/src/plugins/cpptools/cppfilesettingspage.ui b/src/plugins/cpptools/cppfilesettingspage.ui
index f5005ecacb0..f4cf62506f0 100644
--- a/src/plugins/cpptools/cppfilesettingspage.ui
+++ b/src/plugins/cpptools/cppfilesettingspage.ui
@@ -10,9 +10,6 @@
503
-
- Form
-
-
diff --git a/src/plugins/debugger/breakcondition.ui b/src/plugins/debugger/breakcondition.ui
index 4de45fd29da..f5b5b0819d3 100644
--- a/src/plugins/debugger/breakcondition.ui
+++ b/src/plugins/debugger/breakcondition.ui
@@ -10,9 +10,6 @@
142
-
- Dialog
-
-
diff --git a/src/plugins/debugger/cdb/cdboptionspagewidget.ui b/src/plugins/debugger/cdb/cdboptionspagewidget.ui
index 83ddca10879..e14fe0a9692 100644
--- a/src/plugins/debugger/cdb/cdboptionspagewidget.ui
+++ b/src/plugins/debugger/cdb/cdboptionspagewidget.ui
@@ -10,9 +10,6 @@
512
-
- Form
-
-
@@ -106,9 +103,6 @@
background-color: 'red';
-
- TextLabel
-
true
diff --git a/src/plugins/debugger/commonoptionspage.ui b/src/plugins/debugger/commonoptionspage.ui
index f7f733b25c8..f012accca93 100644
--- a/src/plugins/debugger/commonoptionspage.ui
+++ b/src/plugins/debugger/commonoptionspage.ui
@@ -10,9 +10,6 @@
452
-
- Form
-
-
diff --git a/src/plugins/debugger/dumperoptionpage.ui b/src/plugins/debugger/dumperoptionpage.ui
index 0ff6ddc6c2d..fc4933b1d6c 100644
--- a/src/plugins/debugger/dumperoptionpage.ui
+++ b/src/plugins/debugger/dumperoptionpage.ui
@@ -10,9 +10,6 @@
434
-
- Form
-
-
diff --git a/src/plugins/debugger/gdboptionspage.ui b/src/plugins/debugger/gdboptionspage.ui
index 5abd9866daf..7c44ce6a9e2 100644
--- a/src/plugins/debugger/gdboptionspage.ui
+++ b/src/plugins/debugger/gdboptionspage.ui
@@ -10,9 +10,6 @@
452
-
- Form
-
-
diff --git a/src/plugins/designer/cpp/formclasswizardpage.ui b/src/plugins/designer/cpp/formclasswizardpage.ui
index 5b739be4f87..9a2849ad0a0 100644
--- a/src/plugins/designer/cpp/formclasswizardpage.ui
+++ b/src/plugins/designer/cpp/formclasswizardpage.ui
@@ -81,7 +81,7 @@
Aggregation as a pointer member
- buttonGroup
+ buttonGroup
@@ -91,7 +91,7 @@
Aggregation
- buttonGroup
+ buttonGroup
@@ -101,7 +101,7 @@
Multiple Inheritance
- buttonGroup
+ buttonGroup
diff --git a/src/plugins/fakevim/fakevimoptions.ui b/src/plugins/fakevim/fakevimoptions.ui
index 4e3e8465993..8909fd08c0c 100644
--- a/src/plugins/fakevim/fakevimoptions.ui
+++ b/src/plugins/fakevim/fakevimoptions.ui
@@ -10,9 +10,6 @@
322
-
- Form
-
-
diff --git a/src/plugins/genericprojectmanager/genericmakestep.ui b/src/plugins/genericprojectmanager/genericmakestep.ui
index 6a4b2796b5d..cf7420d03cf 100644
--- a/src/plugins/genericprojectmanager/genericmakestep.ui
+++ b/src/plugins/genericprojectmanager/genericmakestep.ui
@@ -10,9 +10,6 @@
392
-
- Form
-
-
diff --git a/src/plugins/git/branchdialog.ui b/src/plugins/git/branchdialog.ui
index 07f7ff656b1..d88914fca5f 100644
--- a/src/plugins/git/branchdialog.ui
+++ b/src/plugins/git/branchdialog.ui
@@ -29,9 +29,6 @@
-
-
- TextLabel
-
diff --git a/src/plugins/git/changeselectiondialog.ui b/src/plugins/git/changeselectiondialog.ui
index 34f2718ec8f..e8e2250a726 100644
--- a/src/plugins/git/changeselectiondialog.ui
+++ b/src/plugins/git/changeselectiondialog.ui
@@ -10,9 +10,6 @@
142
-
- Dialog
-
-
diff --git a/src/plugins/git/settingspage.ui b/src/plugins/git/settingspage.ui
index 1a594bf4313..02f3671a1df 100644
--- a/src/plugins/git/settingspage.ui
+++ b/src/plugins/git/settingspage.ui
@@ -10,9 +10,6 @@
251
-
- Form
-
-
diff --git a/src/plugins/help/docsettingspage.ui b/src/plugins/help/docsettingspage.ui
index 311be060c76..93c1124bf7d 100644
--- a/src/plugins/help/docsettingspage.ui
+++ b/src/plugins/help/docsettingspage.ui
@@ -9,9 +9,6 @@
240
-
- Form
-
-
diff --git a/src/plugins/help/filtersettingspage.ui b/src/plugins/help/filtersettingspage.ui
index 367e7ce0a9e..8a208e63c70 100644
--- a/src/plugins/help/filtersettingspage.ui
+++ b/src/plugins/help/filtersettingspage.ui
@@ -9,9 +9,6 @@
300
-
- Form
-
-
diff --git a/src/plugins/perforce/settingspage.ui b/src/plugins/perforce/settingspage.ui
index b2d6bf10e35..5af25e5f81f 100644
--- a/src/plugins/perforce/settingspage.ui
+++ b/src/plugins/perforce/settingspage.ui
@@ -10,9 +10,6 @@
198
-
- Form
-
6
diff --git a/src/plugins/projectexplorer/buildsettingspropertiespage.ui b/src/plugins/projectexplorer/buildsettingspropertiespage.ui
index 819f17da58e..3fabbcea90e 100644
--- a/src/plugins/projectexplorer/buildsettingspropertiespage.ui
+++ b/src/plugins/projectexplorer/buildsettingspropertiespage.ui
@@ -10,9 +10,6 @@
525
-
- Form
-
-
@@ -125,9 +122,6 @@
false
-
- TextLabel
-
-
diff --git a/src/plugins/projectexplorer/buildstepspage.ui b/src/plugins/projectexplorer/buildstepspage.ui
index 85267824b0a..fcaec1069f3 100644
--- a/src/plugins/projectexplorer/buildstepspage.ui
+++ b/src/plugins/projectexplorer/buildstepspage.ui
@@ -10,9 +10,6 @@
300
-
- Form
-
-
diff --git a/src/plugins/projectexplorer/editorsettingspropertiespage.ui b/src/plugins/projectexplorer/editorsettingspropertiespage.ui
index 704f5cd0b3d..640134cfcfb 100644
--- a/src/plugins/projectexplorer/editorsettingspropertiespage.ui
+++ b/src/plugins/projectexplorer/editorsettingspropertiespage.ui
@@ -10,9 +10,6 @@
300
-
- Form
-
-
diff --git a/src/plugins/projectexplorer/processstep.ui b/src/plugins/projectexplorer/processstep.ui
index 01255ab891a..6e52c4c8893 100644
--- a/src/plugins/projectexplorer/processstep.ui
+++ b/src/plugins/projectexplorer/processstep.ui
@@ -10,9 +10,6 @@
271
-
- Form
-
-
diff --git a/src/plugins/projectexplorer/projectexplorersettingspage.ui b/src/plugins/projectexplorer/projectexplorersettingspage.ui
index 6f48641355e..1a1b37e16ac 100644
--- a/src/plugins/projectexplorer/projectexplorersettingspage.ui
+++ b/src/plugins/projectexplorer/projectexplorersettingspage.ui
@@ -10,9 +10,6 @@
358
-
- Form
-
0
diff --git a/src/plugins/projectexplorer/projectwizardpage.ui b/src/plugins/projectexplorer/projectwizardpage.ui
index 883799224d2..6773a3da3a7 100644
--- a/src/plugins/projectexplorer/projectwizardpage.ui
+++ b/src/plugins/projectexplorer/projectwizardpage.ui
@@ -10,9 +10,6 @@
414
-
- WizardPage
-
Project management
diff --git a/src/plugins/projectexplorer/runsettingspropertiespage.ui b/src/plugins/projectexplorer/runsettingspropertiespage.ui
index d96e20602bc..4959cb93249 100644
--- a/src/plugins/projectexplorer/runsettingspropertiespage.ui
+++ b/src/plugins/projectexplorer/runsettingspropertiespage.ui
@@ -10,9 +10,6 @@
300
-
- Form
-
-
diff --git a/src/plugins/qt4projectmanager/embeddedpropertiespage.ui b/src/plugins/qt4projectmanager/embeddedpropertiespage.ui
index 5f521ed1a3a..6185473212d 100644
--- a/src/plugins/qt4projectmanager/embeddedpropertiespage.ui
+++ b/src/plugins/qt4projectmanager/embeddedpropertiespage.ui
@@ -9,9 +9,6 @@
302
-
- Form
-
-
diff --git a/src/plugins/qt4projectmanager/envvariablespage.ui b/src/plugins/qt4projectmanager/envvariablespage.ui
index 7d5262b21c5..c4f6f558f2d 100644
--- a/src/plugins/qt4projectmanager/envvariablespage.ui
+++ b/src/plugins/qt4projectmanager/envvariablespage.ui
@@ -9,9 +9,6 @@
336
-
- Form
-
9
diff --git a/src/plugins/qt4projectmanager/makestep.ui b/src/plugins/qt4projectmanager/makestep.ui
index 7ce4a4034b0..1a7189300be 100644
--- a/src/plugins/qt4projectmanager/makestep.ui
+++ b/src/plugins/qt4projectmanager/makestep.ui
@@ -10,9 +10,6 @@
384
-
- Form
-
0
diff --git a/src/plugins/qt4projectmanager/proeditorcontainer.ui b/src/plugins/qt4projectmanager/proeditorcontainer.ui
index ba9c371e6d6..0edbfa3ff84 100644
--- a/src/plugins/qt4projectmanager/proeditorcontainer.ui
+++ b/src/plugins/qt4projectmanager/proeditorcontainer.ui
@@ -9,9 +9,6 @@
372
-
- Form
-
-
diff --git a/src/plugins/qt4projectmanager/qmakestep.ui b/src/plugins/qt4projectmanager/qmakestep.ui
index 5d2871a90cc..a28baf6448f 100644
--- a/src/plugins/qt4projectmanager/qmakestep.ui
+++ b/src/plugins/qt4projectmanager/qmakestep.ui
@@ -10,9 +10,6 @@
442
-
- Form
-
0
diff --git a/src/plugins/qt4projectmanager/qt4buildenvironmentwidget.ui b/src/plugins/qt4projectmanager/qt4buildenvironmentwidget.ui
index 354ac61e89b..45c4c906a24 100644
--- a/src/plugins/qt4projectmanager/qt4buildenvironmentwidget.ui
+++ b/src/plugins/qt4projectmanager/qt4buildenvironmentwidget.ui
@@ -10,9 +10,6 @@
300
-
- Form
-
-
diff --git a/src/plugins/qt4projectmanager/qt4projectconfigwidget.ui b/src/plugins/qt4projectmanager/qt4projectconfigwidget.ui
index fda58058507..07ef627d961 100644
--- a/src/plugins/qt4projectmanager/qt4projectconfigwidget.ui
+++ b/src/plugins/qt4projectmanager/qt4projectconfigwidget.ui
@@ -10,9 +10,6 @@
247
-
- Form
-
-
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.ui b/src/plugins/qt4projectmanager/qtversionmanager.ui
index 2dd168325ce..9cf20900683 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.ui
+++ b/src/plugins/qt4projectmanager/qtversionmanager.ui
@@ -10,9 +10,6 @@
505
-
- Form
-
-
diff --git a/src/plugins/quickopen/directoryfilter.ui b/src/plugins/quickopen/directoryfilter.ui
index 9e618324e94..fbc5f82ae26 100644
--- a/src/plugins/quickopen/directoryfilter.ui
+++ b/src/plugins/quickopen/directoryfilter.ui
@@ -10,9 +10,6 @@
271
-
- Dialog
-
-
diff --git a/src/plugins/subversion/settingspage.ui b/src/plugins/subversion/settingspage.ui
index 21b20187bbd..007026bab86 100644
--- a/src/plugins/subversion/settingspage.ui
+++ b/src/plugins/subversion/settingspage.ui
@@ -10,9 +10,6 @@
280
-
- Form
-
-
diff --git a/src/plugins/texteditor/behaviorsettingspage.ui b/src/plugins/texteditor/behaviorsettingspage.ui
index 107e6966595..7e8afc6c174 100644
--- a/src/plugins/texteditor/behaviorsettingspage.ui
+++ b/src/plugins/texteditor/behaviorsettingspage.ui
@@ -10,9 +10,6 @@
325
-
- Form
-
-
diff --git a/src/plugins/texteditor/displaysettingspage.ui b/src/plugins/texteditor/displaysettingspage.ui
index ee465dd8572..d040a94b899 100644
--- a/src/plugins/texteditor/displaysettingspage.ui
+++ b/src/plugins/texteditor/displaysettingspage.ui
@@ -10,9 +10,6 @@
335
-
- Form
-
-
diff --git a/src/plugins/texteditor/fontsettingspage.ui b/src/plugins/texteditor/fontsettingspage.ui
index 8aafb751b2f..a9b391e55bb 100644
--- a/src/plugins/texteditor/fontsettingspage.ui
+++ b/src/plugins/texteditor/fontsettingspage.ui
@@ -10,9 +10,6 @@
471
-
- Form
-
6
diff --git a/src/plugins/vcsbase/vcsbasesettingspage.ui b/src/plugins/vcsbase/vcsbasesettingspage.ui
index 16012b7239c..0d8b3cd74ab 100644
--- a/src/plugins/vcsbase/vcsbasesettingspage.ui
+++ b/src/plugins/vcsbase/vcsbasesettingspage.ui
@@ -10,9 +10,6 @@
407
-
- Form
-
-
diff --git a/src/shared/qrceditor/qrceditor.ui b/src/shared/qrceditor/qrceditor.ui
index 02b5780f54c..0fe1b01b42e 100644
--- a/src/shared/qrceditor/qrceditor.ui
+++ b/src/shared/qrceditor/qrceditor.ui
@@ -10,9 +10,6 @@
381
-
- Form
-
-1
diff --git a/tests/manual/progressmanager/roundprogress.ui b/tests/manual/progressmanager/roundprogress.ui
index 1c1fe4b4725..8ed0cdfdf9a 100644
--- a/tests/manual/progressmanager/roundprogress.ui
+++ b/tests/manual/progressmanager/roundprogress.ui
@@ -9,9 +9,6 @@
144
-
- Form
-
-