diff --git a/src/plugins/cmakeprojectmanager/makestep.cpp b/src/plugins/cmakeprojectmanager/makestep.cpp
index 68e97354b3a903e194b206730fac257fdec1cdcf..41ca1a6bd10d9a8eead44ee14a4750e82495be45 100644
--- a/src/plugins/cmakeprojectmanager/makestep.cpp
+++ b/src/plugins/cmakeprojectmanager/makestep.cpp
@@ -102,8 +102,6 @@ void MakeStep::storeIntoLocalMap(QMap<QString, QVariant> &map)
 bool MakeStep::init()
 {
     CMakeBuildConfiguration *bc = cmakeBuildConfiguration();
-    // TODO, we should probably have a member cmakeBuildConfiguration();
-
     setBuildParser(bc->buildParser());
 
     setEnabled(true);
diff --git a/src/plugins/genericprojectmanager/genericmakestep.cpp b/src/plugins/genericprojectmanager/genericmakestep.cpp
index b57a23e4c616a1854ff73574a092b86c43615680..4f10924cce1818e2ba98701fb1526b6e5577011a 100644
--- a/src/plugins/genericprojectmanager/genericmakestep.cpp
+++ b/src/plugins/genericprojectmanager/genericmakestep.cpp
@@ -125,7 +125,6 @@ QString GenericMakeStep::makeCommand() const
 {
     QString command = m_makeCommand;
     if (command.isEmpty()) {
-        // TODO
         GenericProject *pro = genericBuildConfiguration()->genericProject();
         if (ProjectExplorer::ToolChain *toolChain = pro->toolChain())
             command = toolChain->makeCommand();
@@ -187,7 +186,6 @@ GenericMakeStepConfigWidget::GenericMakeStepConfigWidget(GenericMakeStep *makeSt
     m_ui->setupUi(this);
 
     // TODO update this list also on rescans of the GenericLists.txt
-    //TODO
     GenericProject *pro = m_makeStep->genericBuildConfiguration()->genericProject();
     foreach (const QString &target, pro->targets()) {
         QListWidgetItem *item = new QListWidgetItem(target, m_ui->targetsList);
diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp
index 461915b0c68067b2e3a701cfb7664138baea49f9..9f14985559796f999c79908a76042c45f4b762f0 100644
--- a/src/plugins/genericprojectmanager/genericproject.cpp
+++ b/src/plugins/genericprojectmanager/genericproject.cpp
@@ -158,7 +158,6 @@ BuildConfiguration *GenericBuildConfigurationFactory::create(const QString &type
 
 BuildConfiguration *GenericBuildConfigurationFactory::clone(BuildConfiguration *source) const
 {
-    // TODO
     GenericBuildConfiguration *bc = new GenericBuildConfiguration(static_cast<GenericBuildConfiguration *>(source));
     m_project->addBuildConfiguration(bc);
     return bc;
diff --git a/src/plugins/projectexplorer/project.cpp b/src/plugins/projectexplorer/project.cpp
index 7ab2c9591afaeaea430041f86ec0480e3e70e308..c4cdcd84fce5e7b3ce1308be6070fcbd1f148af8 100644
--- a/src/plugins/projectexplorer/project.cpp
+++ b/src/plugins/projectexplorer/project.cpp
@@ -379,7 +379,7 @@ bool Project::restoreSettingsImpl(PersistentSettingsReader &reader)
 
 BuildConfiguration *Project::activeBuildConfiguration() const
 {
-    return m_activeBuildConfiguration; //TODO
+    return m_activeBuildConfiguration;
 }
 
 void Project::setActiveBuildConfiguration(BuildConfiguration *configuration)
diff --git a/src/plugins/qt4projectmanager/makestep.cpp b/src/plugins/qt4projectmanager/makestep.cpp
index f3442a1a024adaf85e77fb5e6d70dbe3d42a7ae2..9642de569acdb2b2189df1e7928ca7a1996595b1 100644
--- a/src/plugins/qt4projectmanager/makestep.cpp
+++ b/src/plugins/qt4projectmanager/makestep.cpp
@@ -106,7 +106,6 @@ bool MakeStep::init()
     Environment environment = bc->environment();
     setEnvironment(environment);
 
-    //TODO
     QString workingDirectory = bc->buildDirectory();
     setWorkingDirectory(workingDirectory);
 
diff --git a/src/plugins/qt4projectmanager/qmakestep.cpp b/src/plugins/qt4projectmanager/qmakestep.cpp
index bc13e7a2fbe4be7d311f84a4188560e68806d014..2110e15458a9aa1b1e63264404e62ac4b9f009a6 100644
--- a/src/plugins/qt4projectmanager/qmakestep.cpp
+++ b/src/plugins/qt4projectmanager/qmakestep.cpp
@@ -80,7 +80,6 @@ QStringList QMakeStep::allArguments()
     arguments << buildConfiguration()->project()->file()->fileName();
     arguments << "-r";
 
-    // TODO
     if (!additonalArguments.contains("-spec"))
         arguments << "-spec" << bc->qtVersion()->mkspec();
 
@@ -116,7 +115,6 @@ QStringList QMakeStep::allArguments()
 
 bool QMakeStep::init()
 {
-    // TODO
     Qt4BuildConfiguration *qt4bc = qt4BuildConfiguration();
     const QtVersion *qtVersion = qt4bc->qtVersion();
 
diff --git a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
index 824d63654a4cd317bedea5c4dfc88cf59774f1fb..c12d4056a2ffb6e082ae34840d80aab48209e184 100644
--- a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
@@ -269,7 +269,7 @@ MakeStep *Qt4BuildConfiguration::makeStep() const
 }
 
 // returns true if both are equal
-bool Qt4BuildConfiguration::compareBuildConfigurationToImportFrom(const QString &workingDirectory)
+bool Qt4BuildConfiguration::compareToImportFrom(const QString &workingDirectory)
 {
     QMakeStep *qs = qmakeStep();
     if (QDir(workingDirectory).exists(QLatin1String("Makefile")) && qs) {
diff --git a/src/plugins/qt4projectmanager/qt4buildconfiguration.h b/src/plugins/qt4projectmanager/qt4buildconfiguration.h
index 4cb40e4a53301adbd7c9e85c13cb7d4b7fe3dd0c..378876ed93039aa5ae5cd6f6555bb206fe2ac183 100644
--- a/src/plugins/qt4projectmanager/qt4buildconfiguration.h
+++ b/src/plugins/qt4projectmanager/qt4buildconfiguration.h
@@ -94,8 +94,7 @@ public:
     QString makeCommand() const;
     QString defaultMakeTarget() const;
 
-    // TODO rename
-    bool compareBuildConfigurationToImportFrom(const QString &workingDirectory);
+    bool compareToImportFrom(const QString &workingDirectory);
     static QStringList removeSpecFromArgumentList(const QStringList &old);
     static QString extractSpecFromArgumentList(const QStringList &list, QString directory, QtVersion *version);
 
diff --git a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp b/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
index 47aacd9f6932ad26336ffab35f5c8a3d02fb583a..f97ae476e5dc81f593e865c2c7a7549b82d64651 100644
--- a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
+++ b/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
@@ -241,7 +241,7 @@ void Qt4ProjectConfigWidget::updateImportLabel()
                 visible = true;
             } else {
                 // check that the qmake flags, arguments match
-                visible = !m_buildConfiguration->compareBuildConfigurationToImportFrom(m_buildConfiguration->buildDirectory());
+                visible = !m_buildConfiguration->compareToImportFrom(m_buildConfiguration->buildDirectory());
             }
         } else {
             visible = false;