diff --git a/src/Orchard.Tests/DataMigration/SchemaBuilderTests.cs b/src/Orchard.Tests/DataMigration/SchemaBuilderTests.cs
index 2053bffc1..a0ee24ec7 100644
--- a/src/Orchard.Tests/DataMigration/SchemaBuilderTests.cs
+++ b/src/Orchard.Tests/DataMigration/SchemaBuilderTests.cs
@@ -1,5 +1,4 @@
 using System.Data;
-using System.Linq;
 using Autofac;
 using NHibernate;
 using NUnit.Framework;
diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/Commands/ScaffoldingCommands.cs b/src/Orchard.Web/Modules/Orchard.DevTools/Commands/ScaffoldingCommands.cs
index f929d33bc..6422474da 100644
--- a/src/Orchard.Web/Modules/Orchard.DevTools/Commands/ScaffoldingCommands.cs
+++ b/src/Orchard.Web/Modules/Orchard.DevTools/Commands/ScaffoldingCommands.cs
@@ -3,9 +3,7 @@ using System.IO;
 using System.Linq;
 using System.Web.Hosting;
 using Orchard.Commands;
-using Orchard.Data.Migration;
 using Orchard.Data.Migration.Generator;
-using Orchard.Data.Migration.Interpreters;
 using Orchard.DevTools.Services;
 using Orchard.Environment.Extensions;
 
@@ -13,17 +11,11 @@ namespace Orchard.DevTools.Commands {
     [OrchardFeature("Scaffolding")]
     public class ScaffoldingCommands : DefaultOrchardCommandHandler {
         private readonly IExtensionManager _extensionManager;
-        private readonly IDataMigrationManager _dataMigrationManager;
-        private readonly IDataMigrationInterpreter _dataMigrationInterpreter;
         private readonly ISchemaCommandGenerator _schemaCommandGenerator;
 
         public ScaffoldingCommands(IExtensionManager extensionManager,
-            IDataMigrationManager dataMigrationManager,
-            IDataMigrationInterpreter dataMigrationInterpreter,
             ISchemaCommandGenerator schemaCommandGenerator) {
             _extensionManager = extensionManager;
-            _dataMigrationManager = dataMigrationManager;
-            _dataMigrationInterpreter = dataMigrationInterpreter;
             _schemaCommandGenerator = schemaCommandGenerator;
         }
 
diff --git a/src/Orchard.Web/Modules/Orchard.Indexing/Orchard.Indexing.csproj b/src/Orchard.Web/Modules/Orchard.Indexing/Orchard.Indexing.csproj
index 079d90f0e..ccc3e3f4d 100644
--- a/src/Orchard.Web/Modules/Orchard.Indexing/Orchard.Indexing.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Indexing/Orchard.Indexing.csproj
@@ -64,7 +64,7 @@
     <Compile Include="AdminMenu.cs" />
     <Compile Include="Commands\IndexingCommands.cs" />
     <Compile Include="Controllers\AdminController.cs" />
-    <Compile Include="DataMigrations\_IndexingDataMigration.cs" />
+    <Compile Include="DataMigrations\IndexingDataMigration.cs" />
     <Compile Include="Handlers\CreateIndexingTaskHandler.cs" />
     <Compile Include="Models\IndexingTask.cs" />
     <Compile Include="Models\IndexingTaskRecord.cs" />
diff --git a/src/Orchard/Data/Migration/DataMigrationManager.cs b/src/Orchard/Data/Migration/DataMigrationManager.cs
index 163d07e84..9a29521a8 100644
--- a/src/Orchard/Data/Migration/DataMigrationManager.cs
+++ b/src/Orchard/Data/Migration/DataMigrationManager.cs
@@ -3,15 +3,11 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using System.Text.RegularExpressions;
-using FluentNHibernate.Cfg;
-using NHibernate.Tool.hbm2ddl;
 using Orchard.Data.Migration.Generator;
 using Orchard.Data.Migration.Interpreters;
 using Orchard.Data.Migration.Records;
 using Orchard.Data.Migration.Schema;
-using Orchard.Data.Providers;
 using Orchard.Environment.Extensions;
-using Orchard.Environment.ShellBuilders.Models;
 using Orchard.Environment.State;
 using Orchard.Logging;
 
diff --git a/src/Orchard/Data/Migration/Generator/SchemaCommandGenerator.cs b/src/Orchard/Data/Migration/Generator/SchemaCommandGenerator.cs
index c9c462dc7..51e1a6353 100644
--- a/src/Orchard/Data/Migration/Generator/SchemaCommandGenerator.cs
+++ b/src/Orchard/Data/Migration/Generator/SchemaCommandGenerator.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using NHibernate.Cfg;
@@ -8,7 +7,6 @@ using NHibernate.Tool.hbm2ddl;
 using Orchard.Data.Migration.Schema;
 using Orchard.Data.Providers;
 using NHibernate.Dialect;
-using Orchard.Environment.Extensions;
 
 namespace Orchard.Data.Migration.Generator {
     public class SchemaCommandGenerator : ISchemaCommandGenerator {
@@ -30,7 +28,7 @@ namespace Orchard.Data.Migration.Generator {
             }
 
             var configuration = _dataServicesProviderFactory.CreateProvider(parameters).BuildConfiguration(parameters);
-            var dialect = Dialect.GetDialect(configuration.Properties);
+            Dialect.GetDialect(configuration.Properties);
             var mapping = configuration.BuildMapping();
 
             // get the tables using reflection
diff --git a/src/Orchard/Data/SessionFactoryHolder.cs b/src/Orchard/Data/SessionFactoryHolder.cs
index d5ab906ff..c7a41d5cf 100644
--- a/src/Orchard/Data/SessionFactoryHolder.cs
+++ b/src/Orchard/Data/SessionFactoryHolder.cs
@@ -1,10 +1,6 @@
-using System;
-using System.IO;
-using NHibernate;
+using NHibernate;
 using Orchard.Data.Providers;
 using Orchard.Environment.Configuration;
-using Orchard.Environment.Descriptor;
-using Orchard.Environment.Descriptor.Models;
 using Orchard.Environment.ShellBuilders.Models;
 using Orchard.FileSystems.AppData;
 using Orchard.Localization;