diff --git a/src/libs/utils/filesearch.h b/src/libs/utils/filesearch.h
index b008bb714f118b69db6e93d7aae55b03e0afb886..7ad7af6c347f0f3350e1aa44573312a34716e185 100644
--- a/src/libs/utils/filesearch.h
+++ b/src/libs/utils/filesearch.h
@@ -52,7 +52,7 @@ public:
     FileIterator();
     explicit FileIterator(const QStringList &fileList,
                           const QList<QTextCodec *> encodings);
-    ~FileIterator();
+    virtual ~FileIterator();
 
     virtual bool hasNext() const;
     virtual QString next();
diff --git a/src/plugins/bazaar/constants.h b/src/plugins/bazaar/constants.h
index bd78f13340061dc590da9f47d5fb6b40bfff1bb2..932e28e8de368bc5723faa5d4a4fe5f9894ac2c3 100644
--- a/src/plugins/bazaar/constants.h
+++ b/src/plugins/bazaar/constants.h
@@ -44,7 +44,6 @@ const char * const BAZAARDEFAULT = "bzr";
 //changeset identifiers
 const char * const CHANGESET_ID = "([0-9]+)"; // match and capture
 const char * const CHANGESET_ID_EXACT = "[0-9]+"; // match
-const char * const DIFF_ID = "^[-+]{3,3} [ab]{1,1}.*"; // match e.g. +++ b/filename
 
 //BaseEditorParameters
 const char * const COMMANDLOG_ID = "Bazaar Command Log Editor";
@@ -96,7 +95,6 @@ const char * const LOGMULTI = "Bazaar.Action.Logmulti";
 const char * const PULL = "Bazaar.Action.Pull";
 const char * const PUSH = "Bazaar.Action.Push";
 const char * const UPDATE = "Bazaar.Action.Update";
-const char * const CLONE = "Bazaar.Action.Clone";
 const char * const COMMIT = "Bazaar.Action.Commit";
 const char * const CREATE_REPOSITORY = "Bazaar.Action.CreateRepository";
 
diff --git a/src/plugins/coreplugin/coreconstants.h b/src/plugins/coreplugin/coreconstants.h
index b00cbbb8e2aacfd4dee59a2e1db61302dd273eef..62d0dda100cb786da5617a048be94a952c71571f 100644
--- a/src/plugins/coreplugin/coreconstants.h
+++ b/src/plugins/coreplugin/coreconstants.h
@@ -78,15 +78,12 @@ const char * const MODE_DESIGN_TYPE      = "Type.Design";
 const int          P_MODE_WELCOME        = 100;
 const int          P_MODE_EDIT           = 90;
 const int          P_MODE_DESIGN         = 89;
-const int          P_MODE_OUTPUT         = 10;
 
 //menubar
 const char * const MENU_BAR              = "QtCreator.MenuBar";
 
 //menus
 const char * const M_FILE                = "QtCreator.Menu.File";
-const char * const M_FILE_OPEN           = "QtCreator.Menu.File.Open";
-const char * const M_FILE_NEW            = "QtCreator.Menu.File.New";
 const char * const M_FILE_RECENTFILES    = "QtCreator.Menu.File.RecentFiles";
 const char * const M_EDIT                = "QtCreator.Menu.Edit";
 const char * const M_EDIT_ADVANCED       = "QtCreator.Menu.Edit.Advanced";
@@ -135,18 +132,20 @@ const char * const OPTIONS               = "QtCreator.Options";
 const char * const TOGGLE_SIDEBAR        = "QtCreator.ToggleSidebar";
 const char * const TOGGLE_FULLSCREEN     = "QtCreator.ToggleFullScreen";
 
+#ifdef Q_WS_MAC
 const char * const MINIMIZE_WINDOW       = "QtCreator.MinimizeWindow";
 const char * const ZOOM_WINDOW           = "QtCreator.ZoomWindow";
+#endif
 
 const char * const SPLIT                 = "QtCreator.Split";
 const char * const SPLIT_SIDE_BY_SIDE    = "QtCreator.SplitSideBySide";
 const char * const REMOVE_CURRENT_SPLIT  = "QtCreator.RemoveCurrentSplit";
 const char * const REMOVE_ALL_SPLITS     = "QtCreator.RemoveAllSplits";
 const char * const GOTO_OTHER_SPLIT      = "QtCreator.GotoOtherSplit";
-const char * const SAVEASDEFAULT         = "QtCreator.SaveAsDefaultLayout";
-const char * const RESTOREDEFAULT        = "QtCreator.RestoreDefaultLayout";
 const char * const CLOSE                 = "QtCreator.Close";
+#ifdef Q_WS_WIN
 const char * const CLOSE_ALTERNATIVE     = "QtCreator.Close_Alternative"; // temporary, see QTCREATORBUG-72
+#endif
 const char * const CLOSEALL              = "QtCreator.CloseAll";
 const char * const CLOSEOTHERS           = "QtCreator.CloseOthers";
 const char * const GOTONEXT              = "QtCreator.GotoNext";
@@ -155,14 +154,9 @@ const char * const GOTONEXTINHISTORY     = "QtCreator.GotoNextInHistory";
 const char * const GOTOPREVINHISTORY     = "QtCreator.GotoPreviousInHistory";
 const char * const GO_BACK               = "QtCreator.GoBack";
 const char * const GO_FORWARD            = "QtCreator.GoForward";
-const char * const GOTOPREVIOUSGROUP     = "QtCreator.GotoPreviousTabGroup";
-const char * const GOTONEXTGROUP         = "QtCreator.GotoNextTabGroup";
-const char * const WINDOWSLIST           = "QtCreator.WindowsList";
 const char * const ABOUT_QTCREATOR       = "QtCreator.AboutQtCreator";
 const char * const ABOUT_PLUGINS         = "QtCreator.AboutPlugins";
-const char * const ABOUT_QT              = "QtCreator.AboutQt";
 const char * const S_RETURNTOEDITOR      = "QtCreator.ReturnToEditor";
-const char * const OPEN_IN_EXTERNAL_EDITOR = "QtCreator.OpenInExternalEditor";
 
 // default groups
 const char * const G_DEFAULT_ONE         = "QtCreator.Group.Default.One";
@@ -232,9 +226,6 @@ const char * const ICON_PREV             = ":/core/images/prev.png";
 const char * const ICON_DIR              = ":/core/images/dir.png";
 const char * const ICON_CLEAN_PANE       = ":/core/images/clean_pane_small.png";
 const char * const ICON_CLEAR            = ":/core/images/clear.png";
-const char * const ICON_FIND             = ":/core/images/find.png";
-const char * const ICON_FINDNEXT         = ":/core/images/findnext.png";
-const char * const ICON_REPLACE          = ":/core/images/replace.png";
 const char * const ICON_RESET            = ":/core/images/reset.png";
 const char * const ICON_MAGNIFIER        = ":/core/images/magnifier.png";
 const char * const ICON_TOGGLE_SIDEBAR   = ":/core/images/sidebaricon.png";
diff --git a/src/plugins/cppeditor/cppeditorconstants.h b/src/plugins/cppeditor/cppeditorconstants.h
index ad593b45f65c4692aa0bd3d67293ded5a77bdd97..3e778452d2c0733c641f4164b97293335e8e1b2e 100644
--- a/src/plugins/cppeditor/cppeditorconstants.h
+++ b/src/plugins/cppeditor/cppeditorconstants.h
@@ -37,7 +37,6 @@
 namespace CppEditor {
 namespace Constants {
 
-const char * const FORMATCODE   = "CppEditor.FormatCode";
 const char * const M_CONTEXT    = "CppEditor.ContextMenu";
 const char * const C_CPPEDITOR  = "CppPlugin.C++Editor";
 const char * const CPPEDITOR_ID = "CppPlugin.C++Editor";
@@ -50,7 +49,6 @@ const char * const SEPARATOR = "CppEditor.Separator";
 const char * const SEPARATOR2 = "CppEditor.Separator2";
 const char * const SEPARATOR3 = "CppEditor.Separator3";
 const char * const SEPARATOR4 = "CppEditor.Separator4";
-const char * const FIND_REFERENCES = "CppEditor.FindReferences";
 const char * const JUMP_TO_DEFINITION = "CppEditor.JumpToDefinition";
 const char * const UPDATE_CODEMODEL = "CppEditor.UpdateCodeModel";
 
@@ -58,12 +56,6 @@ const int TYPE_HIERARCHY_PRIORITY = 700;
 const char * const TYPE_HIERARCHY_ID = "CppEditor.TypeHierarchy";
 const char * const OPEN_TYPE_HIERARCHY = "CppEditor.OpenTypeHierarchy";
 
-const char * const HEADER_FILE_TYPE = "CppHeaderFiles";
-const char * const SOURCE_FILE_TYPE = "CppSourceFiles";
-
-const char * const MOVE_TO_PREVIOUS_TOKEN = "CppEditor.MoveToPreviousToken";
-const char * const MOVE_TO_NEXT_TOKEN = "CppEditor.MoveToNextToken";
-
 const char * const C_SOURCE_MIMETYPE = "text/x-csrc";
 const char * const C_HEADER_MIMETYPE = "text/x-chdr";
 const char * const CPP_SOURCE_MIMETYPE = "text/x-c++src";
diff --git a/src/plugins/cpptools/cpptoolsconstants.h b/src/plugins/cpptools/cpptoolsconstants.h
index 19be6dfe77505ab729120ec19b3d3c60472ec1ba..7886bb497eee698daa4db38d1fbc3431a33fa877 100644
--- a/src/plugins/cpptools/cpptoolsconstants.h
+++ b/src/plugins/cpptools/cpptoolsconstants.h
@@ -40,7 +40,6 @@ namespace CppTools {
 namespace Constants {
 
 const char * const M_TOOLS_CPP              = "CppTools.Tools.Menu";
-const char * const M_CPP_REFACTORING        = "CppTools.Refactoring.Menu";
 const char * const SWITCH_HEADER_SOURCE     = "CppTools.SwitchHeaderSource";
 const char * const TASK_INDEX               = "CppTools.Task.Index";
 const char * const TASK_SEARCH              = "CppTools.Task.Search";
diff --git a/src/plugins/cvs/cvsconstants.h b/src/plugins/cvs/cvsconstants.h
index ef1e5e6990603be070a529ced2f2ad26d45a6ed5..503b1baf2e0d237cb455c01c1bf31f6bbf3c57c7 100644
--- a/src/plugins/cvs/cvsconstants.h
+++ b/src/plugins/cvs/cvsconstants.h
@@ -38,8 +38,6 @@ namespace CVS {
 namespace Constants {
 
 const char * const CVS_SUBMIT_MIMETYPE = "application/vnd.nokia.text.cvs.submit";
-const char * const CVSEDITOR  = "CVS Editor";
-const char * const CVSEDITOR_KIND  = "CVS Editor";
 const char * const CVSCOMMITEDITOR  = "CVS Commit Editor";
 const char * const CVSCOMMITEDITOR_ID  = "CVS Commit Editor";
 const char * const CVSCOMMITEDITOR_DISPLAY_NAME  = QT_TRANSLATE_NOOP("VCS", "CVS Commit Editor");
diff --git a/src/plugins/debugger/debuggerconstants.h b/src/plugins/debugger/debuggerconstants.h
index 46058d7f87977b576e38dc99317a6479166ed4cf..6dbb096379db3126f64f24d5bc8eb9e2473969ff 100644
--- a/src/plugins/debugger/debuggerconstants.h
+++ b/src/plugins/debugger/debuggerconstants.h
@@ -54,8 +54,6 @@ const char * const NEXT                 = "Debugger.NextLine";
 const char * const REVERSE              = "Debugger.ReverseDirection";
 const char * const OPERATE_BY_INSTRUCTION   = "Debugger.OperateByInstruction";
 
-const char * const M_DEBUG_VIEWS        = "Debugger.Menu.View.Debug";
-
 const char * const C_DEBUGMODE          = "Debugger.DebugMode";
 const char * const C_CPPDEBUGGER        = "Gdb Debugger";
 const char * const C_QMLDEBUGGER        = "Qml/JavaScript Debugger";
@@ -71,7 +69,6 @@ const char * const DEBUGGER_COMMON_SETTINGS_CATEGORY_ICON =
 
 // dock widget names
 const char * const DOCKWIDGET_BREAK      = "Debugger.Docks.Break";
-const char * const DOCKWIDGET_CONSOLE    = "Debugger.Docks.Console";
 const char * const DOCKWIDGET_MODULES    = "Debugger.Docks.Modules";
 const char * const DOCKWIDGET_REGISTER   = "Debugger.Docks.Register";
 const char * const DOCKWIDGET_OUTPUT     = "Debugger.Docks.Output";
diff --git a/src/plugins/designer/designerconstants.h b/src/plugins/designer/designerconstants.h
index cdb9f8243f18fc821b5f9da6de8a9a9780c587ff..0655a9a48c626dabee84e0075c60e250e8be168b 100644
--- a/src/plugins/designer/designerconstants.h
+++ b/src/plugins/designer/designerconstants.h
@@ -52,11 +52,7 @@ const char * const SETTINGS_CPP_SETTINGS_NAME = QT_TRANSLATE_NOOP("Designer", "C
 
 // context
 const char * const C_FORMEDITOR       = "FormEditor.FormEditor";
-const char * const FORMEDITOR_ID      = "FormEditor";
-const char * const C_FORMEDITOR_DISPLAY_NAME  = QT_TRANSLATE_NOOP("Designer", "Form Editor");
-const char * const T_FORMEDITOR         = "FormEditor.Toolbar";
 const char * const M_FORMEDITOR         = "FormEditor.Menu";
-const char * const M_FORMEDITOR_VIEWS   = "FormEditor.Menu.Views";
 const char * const M_FORMEDITOR_PREVIEW = "FormEditor.Menu.Preview";
 
 // Wizard type
diff --git a/src/plugins/find/textfindconstants.h b/src/plugins/find/textfindconstants.h
index 2d4b976f236a04fb28c95908684400517e39071f..bc8fbc6fee9fa07a8ecfa356ceb98b8b356c4b00 100644
--- a/src/plugins/find/textfindconstants.h
+++ b/src/plugins/find/textfindconstants.h
@@ -50,11 +50,9 @@ const char * const G_FIND_FLAGS      = "Find.FindMenu.Flags";
 const char * const G_FIND_ACTIONS    = "Find.FindMenu.Actions";
 
 const char * const ADVANCED_FIND     = "Find.Dialog";
-const char * const FIND              = "Find.FindReplace";
 const char * const FIND_IN_DOCUMENT  = "Find.FindInCurrentDocument";
 const char * const FIND_NEXT         = "Find.FindNext";
 const char * const FIND_PREVIOUS     = "Find.FindPrevious";
-const char * const FIND_ALL          = "Find.FindAll";
 const char * const REPLACE           = "Find.Replace";
 const char * const REPLACE_NEXT      = "Find.ReplaceNext";
 const char * const REPLACE_PREVIOUS  = "Find.ReplacePrevious";
diff --git a/src/plugins/genericprojectmanager/genericprojectconstants.h b/src/plugins/genericprojectmanager/genericprojectconstants.h
index f4c12ff9c63324d75702a8aa898603b5d09c66e6..98dd2f6ccdd641b23dc21850b710e104b9573add 100644
--- a/src/plugins/genericprojectmanager/genericprojectconstants.h
+++ b/src/plugins/genericprojectmanager/genericprojectconstants.h
@@ -39,23 +39,17 @@ namespace Constants {
 
 const char *const PROJECTCONTEXT     = "GenericProject.ProjectContext";
 const char *const GENERICMIMETYPE    = "text/x-generic-project"; // ### FIXME
-const char *const MAKESTEP           = "GenericProjectManager.MakeStep";
 
 // contexts
 const char *const C_FILESEDITOR      = ".files Editor";
 
-// kinds
-const char *const PROJECT_KIND       = "Generic";
-
 const char *const FILES_EDITOR_ID    = "QT4.FilesEditor";
 const char *const FILES_EDITOR_DISPLAY_NAME = QT_TRANSLATE_NOOP("OpenWith::Editors", ".files Editor");
 
 const char *const FILES_MIMETYPE     = "application/vnd.nokia.qt.generic.files";
 
-const char *const INCLUDES_EDITOR    = ".includes Editor";
 const char *const INCLUDES_MIMETYPE  = "application/vnd.nokia.qt.generic.includes";
 
-const char *const CONFIG_EDITOR      = ".config Editor";
 const char *const CONFIG_MIMETYPE    = "application/vnd.nokia.qt.generic.config";
 
 // Project
diff --git a/src/plugins/git/gitconstants.h b/src/plugins/git/gitconstants.h
index d0b46cab0567b6e755ff86b37a4baa9b9ed94d83..718f7155acf36cc7e2df05363c9a559159b1a9ce 100644
--- a/src/plugins/git/gitconstants.h
+++ b/src/plugins/git/gitconstants.h
@@ -60,7 +60,6 @@ const char * const DIFF_SELECTED = "Git.DiffSelectedFilesInLog";
 const char * const SUBMIT_MIMETYPE = "application/vnd.nokia.text.git.submit";
 const char * const GIT_BINARY = "git";
 
-const char * const DIFF_FILE_INDICATOR = "--- ";
 enum { debug = 0 };
 
 } // namespace Constants
diff --git a/src/plugins/glsleditor/glsleditorconstants.h b/src/plugins/glsleditor/glsleditorconstants.h
index ad3b4b4e8a0dd70d2b8bcbca150062f6ea04df7a..2bc009d8287e4cea421024a99a3a6434d8fbc781 100644
--- a/src/plugins/glsleditor/glsleditorconstants.h
+++ b/src/plugins/glsleditor/glsleditorconstants.h
@@ -47,11 +47,8 @@ const char * const SEPARATOR1 = "GLSLEditor.Separator1";
 const char * const SEPARATOR2 = "GLSLEditor.Separator2";
 const char * const M_REFACTORING_MENU_INSERTION_POINT = "GLSLEditor.RefactorGroup";
 
-const char * const RUN_SEP = "GLSLEditor.Run.Separator";
 const char * const C_GLSLEDITOR_ID = "GLSLEditor.GLSLEditor";
 const char * const C_GLSLEDITOR_DISPLAY_NAME = QT_TRANSLATE_NOOP("OpenWith::Editors", "GLSL Editor");
-const char * const TASK_INDEX = "GLSLEditor.TaskIndex";
-const char * const TASK_SEARCH = "GLSLEditor.TaskSearch";
 
 const char * const GLSL_MIMETYPE = "application/x-glsl";
 const char * const GLSL_MIMETYPE_VERT = "text/x-glsl-vert";
diff --git a/src/plugins/macros/macrosconstants.h b/src/plugins/macros/macrosconstants.h
index 12b2b00572b0517d443158303ef3bf188919291d..c181afa4996db223c82e8f2dfa79a85b2fbb01eb 100644
--- a/src/plugins/macros/macrosconstants.h
+++ b/src/plugins/macros/macrosconstants.h
@@ -49,7 +49,6 @@ const char * const M_OPTIONS_PAGE = "Macros";
 const char * const M_OPTIONS_TR_PAGE = "Macros";
 
 const char * const M_STATUS_BUFFER = "Macros.Status";
-const char * const M_INFO_BUFFER = "Macros.Info";
 
 const char * const M_EXTENSION = "mac";
 
diff --git a/src/plugins/mercurial/constants.h b/src/plugins/mercurial/constants.h
index 40247ca94e9443378951e3a06439620c354193e2..5569e77d8e41558efdcf8ad0bbe655731f941c5c 100644
--- a/src/plugins/mercurial/constants.h
+++ b/src/plugins/mercurial/constants.h
@@ -38,18 +38,9 @@ namespace Mercurial {
 namespace Constants {
 
 enum { debug = 0 };
-const char * const MERCURIAL = "mercurial";
 const char * const MECURIALREPO = ".hg";
 const char * const MERCURIALDEFAULT = "hg";
 
-//options page items
-const char * const MERCURIALPATH = "Mercurial_Path";
-const char * const MERCURIALUSERNAME = "Mercurial_Username";
-const char * const MERCURIALEMAIL = "Mercurial_Email";
-const char * const MERCURIALLOGCOUNT = "Mercurial_LogCount";
-const char * const MERCURIALTIMEOUT = "Mercurial_Timeout";
-const char * const MERCURIALPROMPTSUBMIT = "Mercurial_PromptOnSubmit";
-
 //changeset identifiers
 const char * const CHANGESETID12 = " ([a-f0-9]{12,12}) "; //match 12 hex chars and capture
 const char * const CHANGESETID40 = " ([a-f0-9]{40,40}) ";
@@ -113,22 +104,7 @@ const char * const OUTGOING = "Mercurial.Action.Outgoing";
 const char * const COMMIT = "Mercurial.Action.Commit";
 const char * const CREATE_REPOSITORY = "Mercurial.Action.CreateRepository";
 
-//Repository Management
-const char * const MERGE = "Mercurial.Action.Merge";
-const char * const BRANCH = "Mercurial.Action.Branch";
-const char * const HEADS = "Mercurial.Action.Heads";
-const char * const PARENTS = "Mercurial.Action.Parents";
-const char * const TAGS = "Mercurial.Action.Tags";
-const char * const TIP = "Mercurial.Action.TIP";
-const char * const PATHS = "Mercurial.Action.Paths";
-
-//Less commonly used menu actions
-const char * const CLONE = "Mercurial.Action.Clone";
-const char * const INIT = "Mercurial.Action.Init";
-const char * const SERVE = "Mercurial.Action.Serve";
-
 //submit editor actions
-const char * const COMMITEDITOR = "Mercurial.Action.Editor.Commit";
 const char * const DIFFEDITOR = "Mercurial.Action.Editor.Diff";
 
 } // namespace Constants
diff --git a/src/plugins/perforce/perforceconstants.h b/src/plugins/perforce/perforceconstants.h
index fd9454d74dc1645f5c7209f41cfbf09db46c8d6c..25daad60e4eb35259e8f871fba7dd514fb003c80 100644
--- a/src/plugins/perforce/perforceconstants.h
+++ b/src/plugins/perforce/perforceconstants.h
@@ -39,8 +39,6 @@
 namespace Perforce {
 namespace Constants {
 
-const char * const PERFORCEEDITOR_CONTEXT  = "Perforce Editor";
-
 const char * const PERFORCE_SUBMIT_EDITOR_ID  = "Perforce.SubmitEditor";
 const char * const PERFORCE_SUBMIT_EDITOR_DISPLAY_NAME = QT_TRANSLATE_NOOP("VCS", "Perforce.SubmitEditor");
 const char * const PERFORCESUBMITEDITOR_CONTEXT = "Perforce Submit Editor";
diff --git a/src/plugins/projectexplorer/projectexplorerconstants.h b/src/plugins/projectexplorer/projectexplorerconstants.h
index 8fa3e6e43871861ff7f208b0fa95da3e1fa9c1d7..4ac6b60c2003c391838bb8fc1ca89bc857d5d039 100644
--- a/src/plugins/projectexplorer/projectexplorerconstants.h
+++ b/src/plugins/projectexplorer/projectexplorerconstants.h
@@ -66,16 +66,10 @@ const char * const CLEANPROJECTONLY     = "ProjectExplorer.CleanProjectOnly";
 const char * const CLEAN                = "ProjectExplorer.Clean";
 const char * const CLEANCM              = "ProjectExplorer.CleanCM";
 const char * const CLEANSESSION         = "ProjectExplorer.CleanSession";
-const char * const BUILDPROJECTONLYMENU = "ProjectExplorer.BuildProjectOnlyMenu";
-const char * const BUILDCONFIGURATIONMENU = "ProjectExplorer.BuildConfigurationMenu";
 const char * const CANCELBUILD          = "ProjectExplorer.CancelBuild";
-const char * const RUNCONFIGURATIONMENU = "ProjectExplorer.RunConfigurationMenu";
 const char * const RUN                  = "ProjectExplorer.Run";
 const char * const RUNCONTEXTMENU       = "ProjectExplorer.RunContextMenu";
 const char * const STOP                 = "ProjectExplorer.Stop";
-const char * const DEPENDENCIES         = "ProjectExplorer.Dependencies";
-const char * const FINDINALLPROJECTS    = "ProjectExplorer.FindInAllProjects";
-const char * const SHOWPROPERTIES       = "ProjectExplorer.ShowProperties";
 const char * const ADDNEWFILE           = "ProjectExplorer.AddNewFile";
 const char * const ADDEXISTINGFILES     = "ProjectExplorer.AddExistingFiles";
 const char * const ADDNEWSUBPROJECT     = "ProjectExplorer.AddNewSubproject";
@@ -117,9 +111,6 @@ const char * const M_DEBUG              = "ProjectExplorer.Menu.Debug";
 const char * const M_DEBUG_STARTDEBUGGING = "ProjectExplorer.Menu.Debug.StartDebugging";
 const char * const M_SESSION            = "ProjectExplorer.Menu.Session";
 
-// toolbars
-const char * const T_BUILDPROJECT       = "ProjectExplorer.ToolBar.Build";
-
 // menu groups
 const char * const G_BUILD_SESSION      = "ProjectExplorer.Group.BuildSession";
 const char * const G_BUILD_PROJECT      = "ProjectExplorer.Group.Build";
@@ -127,12 +118,6 @@ const char * const G_BUILD_OTHER        = "ProjectExplorer.Group.Other";
 const char * const G_BUILD_RUN          = "ProjectExplorer.Group.Run";
 const char * const G_BUILD_CANCEL       = "ProjectExplorer.Group.BuildCancel";
 
-// toolbar groups
-const char * const G_TOOLBAR_CUSTOM     = "ProjectExplorer.ToolBarGroup.Custom";
-const char * const G_TOOLBAR_BUILD      = "ProjectExplorer.ToolBarGroup.Build";
-const char * const G_TOOLBAR_RUN        = "ProjectExplorer.ToolBarGroup.Run";
-const char * const G_TOOLBAR_OTHER      = "ProjectExplorer.ToolBarGroup.Other";
-
 // context menus
 const char * const M_SESSIONCONTEXT     = "Project.Menu.Session";
 const char * const M_PROJECTCONTEXT     = "Project.Menu.Project";
@@ -167,9 +152,6 @@ const char * const RUNMENUCONTEXTMENU   = "Project.RunMenu";
 // file id
 const char * const FILE_FACTORY_ID      = "ProjectExplorer.FileFactoryId";
 
-// wizard kind
-const char * const WIZARD_TYPE_PROJECT  = "ProjectExplorer.WizardType.Project";
-
 // icons
 const char * const ICON_BUILD           = ":/projectexplorer/images/build.png";
 const char * const ICON_BUILD_SMALL     = ":/projectexplorer/images/build_small.png";
@@ -179,22 +161,12 @@ const char * const ICON_REBUILD         = ":/projectexplorer/images/rebuild.png"
 const char * const ICON_REBUILD_SMALL   = ":/projectexplorer/images/rebuild_small.png";
 const char * const ICON_RUN             = ":/projectexplorer/images/run.png";
 const char * const ICON_RUN_SMALL       = ":/projectexplorer/images/run_small.png";
-const char * const ICON_SESSION         = ":/projectexplorer/images/session.png";
-const char * const ICON_DEBUG           = ":/projectexplorer/images/debugger_start.png";
 const char * const ICON_DEBUG_SMALL     = ":/projectexplorer/images/debugger_start_small.png";
-const char * const ICON_CLOSETAB        = ":/projectexplorer/images/closetab.png";
 const char * const ICON_STOP            = ":/projectexplorer/images/stop.png";
 const char * const ICON_TOOLCHAIN_SETTINGS_CATEGORY = ":projectexplorer/images/build.png"; // FIXME: Need an icon!
 
-// find filters
-const char * const FIND_CUR_PROJECT     = "ProjectExplorer.FindFilter.CurrentProject";
-const char * const FIND_ALL_PROJECTS    = "ProjectExplorer.FindFilter.AllProjects";
-
 const char * const TASK_BUILD           = "ProjectExplorer.Task.Build";
-const char * const SESSIONFILE_MIMETYPE = "application/vnd.nokia.xml.qt.creator.session";
-
 
-const char * const PROFILE_MIMETYPE  = "application/vnd.nokia.qt.qmakeprofile";
 const char * const C_SOURCE_MIMETYPE = "text/x-csrc";
 const char * const C_HEADER_MIMETYPE = "text/x-chdr";
 const char * const CPP_SOURCE_MIMETYPE = "text/x-c++src";
diff --git a/src/plugins/qmldesigner/qmldesignerconstants.h b/src/plugins/qmldesigner/qmldesignerconstants.h
index c5cf13646de0b0912f079135b6a9217ce36c5d02..0d888c9ec891e69451f50953ba77840ed8bd00b2 100644
--- a/src/plugins/qmldesigner/qmldesignerconstants.h
+++ b/src/plugins/qmldesigner/qmldesignerconstants.h
@@ -40,7 +40,6 @@ namespace Constants {
 const char * const DELETE               = "QmlDesigner.Delete";
 
 // context
-const char * const C_DESIGN_MODE        = "QmlDesigner::DesignMode";
 const char * const C_QMLDESIGNER         = "QmlDesigner::QmlDesignerMain";
 const char * const C_QMLFORMEDITOR         = "QmlDesigner::FormEditor";
 
@@ -53,13 +52,6 @@ const char * const RESTORE_DEFAULT_VIEW = "QmlDesigner.RestoreDefaultView";
 const char * const TOGGLE_LEFT_SIDEBAR = "QmlDesigner.ToggleLeftSideBar";
 const char * const TOGGLE_RIGHT_SIDEBAR = "QmlDesigner.ToggleRightSideBar";
 
-// mode
-const char * const DESIGN_MODE_NAME     = "Design";
-
-// Wizard type
-const char * const FORM_MIMETYPE        = "application/x-qmldesigner";
-
-
 // This setting is also accessed by the QMlJsEditor.
 const char * const QML_SETTINGS_GROUP = "QML";
 const char * const QML_DESIGNER_SETTINGS_GROUP = "Designer";
diff --git a/src/plugins/qmljseditor/qmljseditorconstants.h b/src/plugins/qmljseditor/qmljseditorconstants.h
index d674eb380a9840fe417d54c9054658b4691e8d43..d0b036a51876650611bc08dd44fb7fd3d54169e7 100644
--- a/src/plugins/qmljseditor/qmljseditorconstants.h
+++ b/src/plugins/qmljseditor/qmljseditorconstants.h
@@ -47,7 +47,6 @@ const char * const SEPARATOR1 = "QmlJSEditor.Separator1";
 const char * const SEPARATOR2 = "QmlJSEditor.Separator2";
 const char * const M_REFACTORING_MENU_INSERTION_POINT = "QmlJSEditor.RefactorGroup";
 
-const char * const RUN_SEP = "QmlJSEditor.Run.Separator";
 const char * const C_QMLJSEDITOR_ID = "QMLProjectManager.QMLJSEditor";
 const char * const C_QMLJSEDITOR_DISPLAY_NAME = QT_TRANSLATE_NOOP("OpenWith::Editors", "QMLJS Editor");
 const char * const TASK_SEARCH = "QmlJSEditor.TaskSearch";
diff --git a/src/plugins/qmljsinspector/qmljsinspectorconstants.h b/src/plugins/qmljsinspector/qmljsinspectorconstants.h
index eb4fc263ed5386baae069c55436ea909c6e459c9..c36ec856310c08b7e65669068059806ebd239334 100644
--- a/src/plugins/qmljsinspector/qmljsinspectorconstants.h
+++ b/src/plugins/qmljsinspector/qmljsinspectorconstants.h
@@ -36,30 +36,20 @@
 namespace QmlJSInspector {
 namespace Constants {
 
-const char * const RUN = "QmlInspector.Run";
-const char * const STOP = "QmlInspector.Stop";
-
-const char * const COMPLETE_THIS = "QmlInspector.CompleteThis";
-
-const char * const M_DEBUG_SIMULTANEOUSLY = "QmlInspector.Menu.SimultaneousDebug";
-
 const char * const INFO_EXPERIMENTAL = "QmlInspector.Experimental";
 const char * const INFO_OUT_OF_SYNC = "QmlInspector.OutOfSyncWarning";
 
 const char * const DESIGNMODE_ACTION = "QmlInspector.DesignMode";
 const char * const PLAY_ACTION = "QmlInspector.Play";
 const char * const SELECT_ACTION = "QmlInspector.Select";
-const char * const SELECT_MARQUEE_ACTION = "QmlInspector.SelectMarquee";
 const char * const ZOOM_ACTION = "QmlInspector.Zoom";
 const char * const COLOR_PICKER_ACTION = "QmlInspector.ColorPicker";
-const char * const TO_QML_ACTION = "QmlInspector.ToQml";
 const char * const FROM_QML_ACTION = "QmlInspector.FromQml";
 const char * const SHOW_APP_ON_TOP_ACTION = "QmlInspector.ShowAppOnTop";
 
 // settings
 const char * const S_QML_INSPECTOR    = "QML.Inspector";
 const char * const S_LIVE_PREVIEW_WARNING_KEY = "ShowLivePreview";
-const char * const ARG_DESIGNMODE = "-designmode";
 
 enum DesignTool {
     NoTool = 0,
diff --git a/src/plugins/qmlprojectmanager/qmlprojectconstants.h b/src/plugins/qmlprojectmanager/qmlprojectconstants.h
index 3209ed704696c1e1389acd83e42e6571974e9dd0..e2866ab9003533bca92be460b5db74d8bb27af36 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectconstants.h
+++ b/src/plugins/qmlprojectmanager/qmlprojectconstants.h
@@ -41,16 +41,6 @@ const char *const PROJECTCONTEXT     = "QmlProject.ProjectContext";
 const char *const LANG_QML           = "QML";
 const char *const QMLMIMETYPE        = "application/x-qmlproject";
 
-// contexts
-const char *const C_FILESEDITOR      = ".files Editor";
-
-// kinds
-const char *const PROJECT_KIND       = "QML";
-
-const char *const FILES_EDITOR_ID    = "Qt4.QmlProjectEditor";
-const char *const FILES_EDITOR_DISPLAY_NAME = QT_TRANSLATE_NOOP("OpenWith::Editors", ".qmlproject Editor");
-const char *const FILES_MIMETYPE     = QMLMIMETYPE;
-
 } // namespace Constants
 } // namespace QmlProjectManager
 
diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanagerconstants.h b/src/plugins/qmlprojectmanager/qmlprojectmanagerconstants.h
index 40235596cd0ed1ebcc3a4fa09f0df5a6b6cfb996..aea47fd52bc9e1ba060e4a30b4560cc1bf86464b 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectmanagerconstants.h
+++ b/src/plugins/qmlprojectmanager/qmlprojectmanagerconstants.h
@@ -37,7 +37,6 @@ namespace QmlProjectManager {
 namespace Constants {
 
 const char * const QML_RC_ID = "QmlProjectManager.QmlRunConfiguration";
-const char * const QML_RC_DISPLAY_NAME = QT_TRANSLATE_NOOP("QmlProjectManager::Internal::QmlRunConfiguration", "QML Viewer");
 const char * const QML_VIEWER_QT_KEY = "QmlProjectManager.QmlRunConfiguration.QtVersion";
 const char * const QML_VIEWER_ARGUMENTS_KEY = "QmlProjectManager.QmlRunConfiguration.QDeclarativeViewerArguments";
 const char * const QML_VIEWER_TARGET_ID = "QmlProjectManager.QmlTarget";
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoconstants.h b/src/plugins/qt4projectmanager/qt-maemo/maemoconstants.h
index c3bbef6d9254c1145c4beccf482bbb5570386c1b..bd68d87d1018e4e9b26ec896d51275d3bf9222af 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoconstants.h
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemoconstants.h
@@ -51,7 +51,6 @@ static const QLatin1String MAEMO_RC_ID(PREFIX);
 static const QLatin1String MAEMO_RC_ID_PREFIX(PREFIX ".");
 
 static const QLatin1String ArgumentsKey(PREFIX ".Arguments");
-static const QLatin1String SimulatorPathKey(PREFIX ".Simulator");
 static const QLatin1String DeviceIdKey(PREFIX ".DeviceId");
 static const QLatin1String LastDeployedHostsKey(PREFIX ".LastDeployedHosts");
 static const QLatin1String LastDeployedFilesKey(PREFIX ".LastDeployedFiles");
diff --git a/src/plugins/subversion/subversionconstants.h b/src/plugins/subversion/subversionconstants.h
index e0739bc243c386f0a011e35cb256a2a2c30a5eb8..de62479fa026fc269aa42683ff2382de190ae44f 100644
--- a/src/plugins/subversion/subversionconstants.h
+++ b/src/plugins/subversion/subversionconstants.h
@@ -40,9 +40,6 @@ namespace Subversion {
 namespace Constants {
 
 const char * const SUBVERSION_SUBMIT_MIMETYPE = "application/vnd.nokia.text.subversion.submit";
-const char * const SUBVERSIONEDITOR  = "Subversion Editor";
-const char * const SUBVERSIONEDITOR_ID  = "Subversion Editor";
-const char * const SUBVERSIONEDITOR_DISPLAY_NAME  = QT_TRANSLATE_NOOP("VCS", "Subversion Editor");
 const char * const SUBVERSIONCOMMITEDITOR  = "Subversion Commit Editor";
 const char * const SUBVERSIONCOMMITEDITOR_ID  = "Subversion Commit Editor";
 const char * const SUBVERSIONCOMMITEDITOR_DISPLAY_NAME  = QT_TRANSLATE_NOOP("VCS", "Subversion Commit Editor");
diff --git a/src/plugins/texteditor/texteditorconstants.h b/src/plugins/texteditor/texteditorconstants.h
index 82209f52dbe761f999eb4f4898209246d5b83614..0d64428bfd0aeab72f82b75134bf14e1ce00a499 100644
--- a/src/plugins/texteditor/texteditorconstants.h
+++ b/src/plugins/texteditor/texteditorconstants.h
@@ -46,14 +46,13 @@ const char * const VISUALIZE_WHITESPACE  = "TextEditor.VisualizeWhitespace";
 const char * const CLEAN_WHITESPACE      = "TextEditor.CleanWhitespace";
 const char * const TEXT_WRAPPING         = "TextEditor.TextWrapping";
 const char * const UN_COMMENT_SELECTION  = "TextEditor.UnCommentSelection";
-const char * const REFORMAT              = "TextEditor.Reformat";
-const char * const FOLD              = "TextEditor.Fold";
+const char * const FOLD                  = "TextEditor.Fold";
 const char * const UNFOLD                = "TextEditor.Unfold";
-const char * const UNFOLD_ALL       = "TextEditor.UnFoldAll";
+const char * const UNFOLD_ALL            = "TextEditor.UnFoldAll";
 const char * const AUTO_INDENT_SELECTION = "TextEditor.AutoIndentSelection";
 const char * const INCREASE_FONT_SIZE    = "TextEditor.IncreaseFontSize";
 const char * const DECREASE_FONT_SIZE    = "TextEditor.DecreaseFontSize";
-const char * const RESET_FONT_SIZE    = "TextEditor.ResetFontSize";
+const char * const RESET_FONT_SIZE       = "TextEditor.ResetFontSize";
 const char * const GOTO_BLOCK_START      = "TextEditor.GotoBlockStart";
 const char * const GOTO_BLOCK_START_WITH_SELECTION = "TextEditor.GotoBlockStartWithSelection";
 const char * const GOTO_BLOCK_END        = "TextEditor.GotoBlockEnd";
@@ -72,19 +71,16 @@ const char * const LOWERCASE_SELECTION   = "TextEditor.LowercaseSelection";
 const char * const CUT_LINE              = "TextEditor.CutLine";
 const char * const COPY_LINE             = "TextEditor.CopyLine";
 const char * const DELETE_LINE           = "TextEditor.DeleteLine";
-const char * const DELETE_WORD           = "TextEditor.DeleteWord";
 const char * const SELECT_ENCODING       = "TextEditor.SelectEncoding";
-const char * const REWRAP_PARAGRAPH       =  "TextEditor.RewrapParagraph";
-const char * const GOTO_OPENING_PARENTHESIS = "TextEditor.GotoOpeningParenthesis";
-const char * const GOTO_CLOSING_PARENTHESIS = "TextEditor.GotoClosingParenthesis";
-const char * const GOTO_LINE_START = "TextEditor.GotoLineStart";
-const char * const GOTO_LINE_END = "TextEditor.GotoLineEnd";
-const char * const GOTO_NEXT_LINE = "TextEditor.GotoNextLine";
-const char * const GOTO_PREVIOUS_LINE = "TextEditor.GotoPreviousLine";
+const char * const REWRAP_PARAGRAPH      =  "TextEditor.RewrapParagraph";
+const char * const GOTO_LINE_START       = "TextEditor.GotoLineStart";
+const char * const GOTO_LINE_END         = "TextEditor.GotoLineEnd";
+const char * const GOTO_NEXT_LINE        = "TextEditor.GotoNextLine";
+const char * const GOTO_PREVIOUS_LINE    = "TextEditor.GotoPreviousLine";
 const char * const GOTO_PREVIOUS_CHARACTER = "TextEditor.GotoPreviousCharacter";
-const char * const GOTO_NEXT_CHARACTER = "TextEditor.GotoNextCharacter";
-const char * const GOTO_PREVIOUS_WORD = "TextEditor.GotoPreviousWord";
-const char * const GOTO_NEXT_WORD = "TextEditor.GotoNextWord";
+const char * const GOTO_NEXT_CHARACTER   = "TextEditor.GotoNextCharacter";
+const char * const GOTO_PREVIOUS_WORD    = "TextEditor.GotoPreviousWord";
+const char * const GOTO_NEXT_WORD        = "TextEditor.GotoNextWord";
 const char * const GOTO_PREVIOUS_WORD_CAMEL_CASE = "TextEditor.GotoPreviousWordCamelCase";
 const char * const GOTO_NEXT_WORD_CAMEL_CASE = "TextEditor.GotoNextWordCamelCase";
 const char * const GOTO_LINE_START_WITH_SELECTION = "TextEditor.GotoLineStartWithSelection";
@@ -101,7 +97,7 @@ const char * const C_TEXTEDITOR_MIMETYPE_TEXT = "text/plain";
 const char * const INFO_SYNTAX_DEFINITION = "TextEditor.InfoSyntaxDefinition";
 const char * const TASK_DOWNLOAD_DEFINITIONS = "TextEditor.Task.Download";
 const char * const TASK_REGISTER_DEFINITIONS = "TextEditor.Task.Register";
-const char * const TASK_OPEN_FILE = "TextEditor.Task.OpenFile";
+const char * const TASK_OPEN_FILE        = "TextEditor.Task.OpenFile";
 
 // Text color and style categories
 const char * const C_TEXT                = "Text";