diff --git a/src/plugins/qmlprojectmanager/QmlProject.mimetypes.xml b/src/plugins/qmlprojectmanager/QmlProject.mimetypes.xml
index 9132ca54a667fe26385275be6fa495feff113be7..28ba62a569c9b96382305ed36fbfa129ca45ef6d 100644
--- a/src/plugins/qmlprojectmanager/QmlProject.mimetypes.xml
+++ b/src/plugins/qmlprojectmanager/QmlProject.mimetypes.xml
@@ -6,11 +6,4 @@
     <comment>Qml Project file</comment>
     <glob pattern="*.qmlproject"/>
   </mime-type>
-
-  <mime-type type="application/vnd.nokia.qt.qml.files">
-    <sub-class-of type="text/plain"/>
-    <comment>Qml Project Files</comment>
-    <glob pattern="*.files"/>
-  </mime-type>
-
 </mime-info>
diff --git a/src/plugins/qmlprojectmanager/qmlproject.cpp b/src/plugins/qmlprojectmanager/qmlproject.cpp
index 22f621296fb9732f4db39154f843311130264fef..5a938b0e54d1248f0282811fbb4c81ff7ca34c23 100644
--- a/src/plugins/qmlprojectmanager/qmlproject.cpp
+++ b/src/plugins/qmlprojectmanager/qmlproject.cpp
@@ -114,10 +114,7 @@ QmlProject::QmlProject(Manager *manager, const QString &fileName)
       m_fileName(fileName)
 {
     QFileInfo fileInfo(m_fileName);
-    QDir dir = fileInfo.dir();
-
-    m_projectName      = fileInfo.completeBaseName();
-    m_filesFileName    = QFileInfo(dir, m_projectName + QLatin1String(".files")).absoluteFilePath();
+    m_projectName = fileInfo.completeBaseName();
 
     m_file = new QmlProjectFile(this, fileName);
     m_rootNode = new QmlProjectNode(this, m_file);
@@ -136,7 +133,7 @@ QmlProject::~QmlProject()
 }
 
 QString QmlProject::filesFileName() const
-{ return m_filesFileName; }
+{ return m_fileName; }
 
 static QStringList readLines(const QString &absoluteFileName)
 {
diff --git a/src/plugins/qmlprojectmanager/qmlprojectconstants.h b/src/plugins/qmlprojectmanager/qmlprojectconstants.h
index 55b548daba3e64e9164d7985b24152bae0b6724a..d459afc50d72276f857260e33c10a98dab2690de 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectconstants.h
+++ b/src/plugins/qmlprojectmanager/qmlprojectconstants.h
@@ -34,7 +34,7 @@ namespace QmlProjectManager {
 namespace Constants {
 
 const char *const PROJECTCONTEXT     = "QmlProject.ProjectContext";
-const char *const QMLMIMETYPE    = "text/x-qml-project"; // ### FIXME
+const char *const QMLMIMETYPE        = "text/x-qml-project"; // ### FIXME
 const char *const MAKESTEP           = "QmlProjectManager.MakeStep";
 
 // contexts
@@ -43,14 +43,8 @@ const char *const C_FILESEDITOR      = ".files Editor";
 // kinds
 const char *const PROJECT_KIND       = "Qml";
 
-const char *const FILES_EDITOR       = ".files Editor";
-const char *const FILES_MIMETYPE     = "application/vnd.nokia.qt.qml.files";
-
-const char *const INCLUDES_EDITOR    = ".includes Editor";
-const char *const INCLUDES_MIMETYPE  = "application/vnd.nokia.qt.qml.includes";
-
-const char *const CONFIG_EDITOR      = ".includes Editor";
-const char *const CONFIG_MIMETYPE    = "application/vnd.nokia.qt.qml.config";
+const char *const FILES_EDITOR       = ".qmlproject Editor";
+const char *const FILES_MIMETYPE     = QMLMIMETYPE;
 
 } // namespace Constants
 } // namespace QmlProjectManager
diff --git a/src/plugins/qmlprojectmanager/qmlprojectfileseditor.cpp b/src/plugins/qmlprojectmanager/qmlprojectfileseditor.cpp
index afd40d81e1875720923e6c5e6385ac0540b81173..15e41b7f1f6e7da8dde4ea5ed237bb854c5e843f 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectfileseditor.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectfileseditor.cpp
@@ -52,8 +52,6 @@ ProjectFilesFactory::ProjectFilesFactory(Manager *manager,
       m_actionHandler(handler)
 {
     m_mimeTypes.append(QLatin1String(Constants::FILES_MIMETYPE));
-    m_mimeTypes.append(QLatin1String(Constants::INCLUDES_MIMETYPE));
-    m_mimeTypes.append(QLatin1String(Constants::CONFIG_MIMETYPE));
 }
 
 ProjectFilesFactory::~ProjectFilesFactory()
diff --git a/src/plugins/qmlprojectmanager/qmlprojectwizard.cpp b/src/plugins/qmlprojectmanager/qmlprojectwizard.cpp
index dbb0b02b6ef607eb8cd63902856ce209f0ae296c..9e3ab8fb40270523f39c4ce8dd2fac0a8091b0c2 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectwizard.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectwizard.cpp
@@ -264,7 +264,7 @@ bool QmlProjectWizard::isValidDir(const QFileInfo &fileInfo) const
 }
 
 Core::GeneratedFiles QmlProjectWizard::generateFiles(const QWizard *w,
-						     QString *errorMessage) const
+                                                     QString *errorMessage) const
 {
     Q_UNUSED(errorMessage)
 
@@ -273,7 +273,6 @@ Core::GeneratedFiles QmlProjectWizard::generateFiles(const QWizard *w,
     const QDir dir(projectPath);
     const QString projectName = wizard->projectName();
     const QString creatorFileName = QFileInfo(dir, projectName + QLatin1String(".qmlproject")).absoluteFilePath();
-    const QString filesFileName = QFileInfo(dir, projectName + QLatin1String(".files")).absoluteFilePath();
 
     Core::ICore *core = Core::ICore::instance();
     Core::MimeDatabase *mimeDatabase = core->mimeDatabase();
@@ -284,13 +283,9 @@ Core::GeneratedFiles QmlProjectWizard::generateFiles(const QWizard *w,
     getFileList(dir, projectPath, suffixes, &sources, &paths);
 
     Core::GeneratedFile generatedCreatorFile(creatorFileName);
-    generatedCreatorFile.setContents(QLatin1String("[General]\n"));
-
-    Core::GeneratedFile generatedFilesFile(filesFileName);
-    generatedFilesFile.setContents(sources.join(QLatin1String("\n")));
+    generatedCreatorFile.setContents(sources.join(QLatin1String("\n")));
 
     Core::GeneratedFiles files;
-    files.append(generatedFilesFile);
     files.append(generatedCreatorFile);
 
     return files;