diff --git a/src/Orchard.Core.Tests/Feeds/Controllers/FeedControllerTests.cs b/src/Orchard.Core.Tests/Feeds/Controllers/FeedControllerTests.cs
index c448f8f90..b7489c938 100644
--- a/src/Orchard.Core.Tests/Feeds/Controllers/FeedControllerTests.cs
+++ b/src/Orchard.Core.Tests/Feeds/Controllers/FeedControllerTests.cs
@@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
-using System.Text;
using System.Web.Mvc;
using System.Web.Routing;
using System.Xml.Linq;
diff --git a/src/Orchard.Core.Tests/Orchard.Core.Tests.csproj b/src/Orchard.Core.Tests/Orchard.Core.Tests.csproj
index fbc741551..ae8d0f188 100644
--- a/src/Orchard.Core.Tests/Orchard.Core.Tests.csproj
+++ b/src/Orchard.Core.Tests/Orchard.Core.Tests.csproj
@@ -67,14 +67,10 @@
3.5
+
3.5
-
- 3.5
-
-
-
diff --git a/src/Orchard.Core.Tests/Properties/AssemblyInfo.cs b/src/Orchard.Core.Tests/Properties/AssemblyInfo.cs
index 6f19864ea..18a11c9ab 100644
--- a/src/Orchard.Core.Tests/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Core.Tests/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
using System.Reflection;
-using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
diff --git a/src/Orchard.Core.Tests/Scheduling/ScheduledTaskManagerTests.cs b/src/Orchard.Core.Tests/Scheduling/ScheduledTaskManagerTests.cs
index 48d3658ae..5587a4655 100644
--- a/src/Orchard.Core.Tests/Scheduling/ScheduledTaskManagerTests.cs
+++ b/src/Orchard.Core.Tests/Scheduling/ScheduledTaskManagerTests.cs
@@ -9,7 +9,6 @@ using Orchard.ContentManagement.Records;
using Orchard.Core.Scheduling.Models;
using Orchard.Core.Scheduling.Services;
using Orchard.Data;
-using Orchard.Tasks;
using Orchard.Tasks.Scheduling;
using Orchard.Tests.Modules;
diff --git a/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj b/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj
index 1f4405293..8dbf5124c 100644
--- a/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj
+++ b/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj
@@ -78,9 +78,6 @@
3.5
-
- 3.5
-
diff --git a/src/Orchard.Web.Tests/Orchard.Web.Tests.csproj b/src/Orchard.Web.Tests/Orchard.Web.Tests.csproj
index 036d7fe46..f96fab8ee 100644
--- a/src/Orchard.Web.Tests/Orchard.Web.Tests.csproj
+++ b/src/Orchard.Web.Tests/Orchard.Web.Tests.csproj
@@ -39,7 +39,6 @@
False
..\..\lib\nunit\nunit.framework.dll
-
diff --git a/src/Orchard.Web/Core/Common/Drivers/BodyDriver.cs b/src/Orchard.Web/Core/Common/Drivers/BodyDriver.cs
index e4dc6f79f..04d56dc88 100644
--- a/src/Orchard.Web/Core/Common/Drivers/BodyDriver.cs
+++ b/src/Orchard.Web/Core/Common/Drivers/BodyDriver.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Text.RegularExpressions;
+using System.Text.RegularExpressions;
using JetBrains.Annotations;
using Orchard.ContentManagement;
using Orchard.ContentManagement.Aspects;
diff --git a/src/Orchard.Web/Core/Common/Permissions.cs b/src/Orchard.Web/Core/Common/Permissions.cs
index 14a1014b3..b20fb866c 100644
--- a/src/Orchard.Web/Core/Common/Permissions.cs
+++ b/src/Orchard.Web/Core/Common/Permissions.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
using Orchard.Security.Permissions;
namespace Orchard.Core.Common {
diff --git a/src/Orchard.Web/Core/Feeds/Controllers/FeedController.cs b/src/Orchard.Web/Core/Feeds/Controllers/FeedController.cs
index 7639e9200..9004cb077 100644
--- a/src/Orchard.Web/Core/Feeds/Controllers/FeedController.cs
+++ b/src/Orchard.Web/Core/Feeds/Controllers/FeedController.cs
@@ -1,7 +1,6 @@
using System.Collections.Generic;
using System.Linq;
using System.Web.Mvc;
-using JetBrains.Annotations;
using Orchard.Core.Feeds.Models;
using Orchard.Logging;
using Orchard.Mvc.Results;
diff --git a/src/Orchard.Web/Core/Feeds/IFeedItemBuilder.cs b/src/Orchard.Web/Core/Feeds/IFeedItemBuilder.cs
index 4f0603df0..d0c5abed2 100644
--- a/src/Orchard.Web/Core/Feeds/IFeedItemBuilder.cs
+++ b/src/Orchard.Web/Core/Feeds/IFeedItemBuilder.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Orchard.Core.Feeds.Models;
+using Orchard.Core.Feeds.Models;
namespace Orchard.Core.Feeds {
public interface IFeedItemBuilder : IEvents {
diff --git a/src/Orchard.Web/Core/Feeds/IFeedQueryProvider.cs b/src/Orchard.Web/Core/Feeds/IFeedQueryProvider.cs
index 49015335f..6320c5c62 100644
--- a/src/Orchard.Web/Core/Feeds/IFeedQueryProvider.cs
+++ b/src/Orchard.Web/Core/Feeds/IFeedQueryProvider.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-using Orchard.ContentManagement;
-using Orchard.Core.Feeds.Models;
+using Orchard.Core.Feeds.Models;
namespace Orchard.Core.Feeds {
public interface IFeedQueryProvider : IEvents {
diff --git a/src/Orchard.Web/Core/Navigation/Controllers/AdminController.cs b/src/Orchard.Web/Core/Navigation/Controllers/AdminController.cs
index 3c41ffe1a..d5c5fa2e4 100644
--- a/src/Orchard.Web/Core/Navigation/Controllers/AdminController.cs
+++ b/src/Orchard.Web/Core/Navigation/Controllers/AdminController.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
using System.Linq;
using System.Web.Mvc;
using Orchard.ContentManagement;
diff --git a/src/Orchard.Web/Core/Orchard.Core.csproj b/src/Orchard.Web/Core/Orchard.Core.csproj
index 6ff844442..1f09c8fbd 100644
--- a/src/Orchard.Web/Core/Orchard.Core.csproj
+++ b/src/Orchard.Web/Core/Orchard.Core.csproj
@@ -32,16 +32,12 @@
-
3.5
3.5
-
- 3.5
-
False
..\..\..\lib\aspnetmvc\System.Web.Mvc.dll
@@ -49,16 +45,12 @@
3.5
-
-
-
-
diff --git a/src/Orchard.Web/Core/Properties/AssemblyInfo.cs b/src/Orchard.Web/Core/Properties/AssemblyInfo.cs
index 8120f0ccd..6ad81af5b 100644
--- a/src/Orchard.Web/Core/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Core/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
using System.Reflection;
-using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
diff --git a/src/Orchard.Web/Core/Themes/Permissions.cs b/src/Orchard.Web/Core/Themes/Permissions.cs
index e5656fe5f..8d6432c9f 100644
--- a/src/Orchard.Web/Core/Themes/Permissions.cs
+++ b/src/Orchard.Web/Core/Themes/Permissions.cs
@@ -1,5 +1,4 @@
using System.Collections.Generic;
-using System.Linq;
using Orchard.Security.Permissions;
namespace Orchard.Core.Themes {
diff --git a/src/Orchard.Web/Core/Themes/ViewModels/PreviewViewModel.cs b/src/Orchard.Web/Core/Themes/ViewModels/PreviewViewModel.cs
index 480a771e9..952eca8c7 100644
--- a/src/Orchard.Web/Core/Themes/ViewModels/PreviewViewModel.cs
+++ b/src/Orchard.Web/Core/Themes/ViewModels/PreviewViewModel.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
+using System.Collections.Generic;
using System.Web.Mvc;
namespace Orchard.Core.Themes.ViewModels {
diff --git a/src/Orchard.Web/Core/XmlRpc/Controllers/HomeController.cs b/src/Orchard.Web/Core/XmlRpc/Controllers/HomeController.cs
index 632b304f6..5f72dc423 100644
--- a/src/Orchard.Web/Core/XmlRpc/Controllers/HomeController.cs
+++ b/src/Orchard.Web/Core/XmlRpc/Controllers/HomeController.cs
@@ -1,8 +1,6 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
using System.Web;
using System.Web.Mvc;
-using System.Xml;
using System.Xml.Linq;
using Orchard.Core.XmlRpc.Models;
using Orchard.Logging;
diff --git a/src/Orchard.Web/Core/XmlRpc/Controllers/LiveWriterController.cs b/src/Orchard.Web/Core/XmlRpc/Controllers/LiveWriterController.cs
index f05d5ab48..c498ae11b 100644
--- a/src/Orchard.Web/Core/XmlRpc/Controllers/LiveWriterController.cs
+++ b/src/Orchard.Web/Core/XmlRpc/Controllers/LiveWriterController.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
+using System.Web;
using System.Web.Mvc;
using System.Xml.Linq;
using Orchard.Logging;
diff --git a/src/Orchard.Web/Core/XmlRpc/Models/ModelBinderProvider.cs b/src/Orchard.Web/Core/XmlRpc/Models/ModelBinderProvider.cs
index b15926792..968ac9dc1 100644
--- a/src/Orchard.Web/Core/XmlRpc/Models/ModelBinderProvider.cs
+++ b/src/Orchard.Web/Core/XmlRpc/Models/ModelBinderProvider.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
+using System.Collections.Generic;
using System.Web.Mvc;
using System.Xml;
using System.Xml.Linq;
diff --git a/src/Orchard.Web/Modules/Futures.Widgets/Futures.Widgets.csproj b/src/Orchard.Web/Modules/Futures.Widgets/Futures.Widgets.csproj
index 547e232f9..c60ae40fe 100644
--- a/src/Orchard.Web/Modules/Futures.Widgets/Futures.Widgets.csproj
+++ b/src/Orchard.Web/Modules/Futures.Widgets/Futures.Widgets.csproj
@@ -32,32 +32,18 @@
-
-
- 3.5
-
3.5
-
- 3.5
-
False
..\..\..\..\lib\aspnetmvc\System.Web.Mvc.dll
-
- 3.5
-
-
-
-
-
diff --git a/src/Orchard.Web/Modules/Futures.Widgets/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Futures.Widgets/Properties/AssemblyInfo.cs
index b0a50137d..f0a63b82e 100644
--- a/src/Orchard.Web/Modules/Futures.Widgets/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Futures.Widgets/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
using System.Reflection;
-using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
diff --git a/src/Orchard.Web/Modules/Futures.Widgets/WidgetFilter.cs b/src/Orchard.Web/Modules/Futures.Widgets/WidgetFilter.cs
index dd6f14fc3..91aeb82af 100644
--- a/src/Orchard.Web/Modules/Futures.Widgets/WidgetFilter.cs
+++ b/src/Orchard.Web/Modules/Futures.Widgets/WidgetFilter.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Linq;
-using System.Web.Mvc;
+using System.Web.Mvc;
using Futures.Widgets.Models;
using Orchard.ContentManagement;
using Orchard.Mvc.Filters;
diff --git a/src/Orchard.Web/Modules/Orchard.Media/Permissions.cs b/src/Orchard.Web/Modules/Orchard.Media/Permissions.cs
index e8f8ece17..8f30785f0 100644
--- a/src/Orchard.Web/Modules/Orchard.Media/Permissions.cs
+++ b/src/Orchard.Web/Modules/Orchard.Media/Permissions.cs
@@ -1,5 +1,4 @@
using System.Collections.Generic;
-using System.Linq;
using Orchard.Security.Permissions;
namespace Orchard.Media {
diff --git a/src/Orchard/ContentManagement/ContentModule.cs b/src/Orchard/ContentManagement/ContentModule.cs
index 6b7e15f4d..f4e355478 100644
--- a/src/Orchard/ContentManagement/ContentModule.cs
+++ b/src/Orchard/ContentManagement/ContentModule.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Autofac.Builder;
+using Autofac.Builder;
namespace Orchard.ContentManagement {
public class ContentModule : Module {
diff --git a/src/Orchard/ContentManagement/ContentType.cs b/src/Orchard/ContentManagement/ContentType.cs
index af888d428..acf310bfd 100644
--- a/src/Orchard/ContentManagement/ContentType.cs
+++ b/src/Orchard/ContentManagement/ContentType.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Orchard.ContentManagement {
+namespace Orchard.ContentManagement {
public class ContentType {
public string Name { get; set; }
public string DisplayName { get; set; }
diff --git a/src/Orchard/ContentManagement/Handlers/BuildDisplayModelContext.cs b/src/Orchard/ContentManagement/Handlers/BuildDisplayModelContext.cs
index 1b530d9ce..04f55305d 100644
--- a/src/Orchard/ContentManagement/Handlers/BuildDisplayModelContext.cs
+++ b/src/Orchard/ContentManagement/Handlers/BuildDisplayModelContext.cs
@@ -1,4 +1,3 @@
-using System.Linq;
using Orchard.ContentManagement.ViewModels;
using Orchard.Mvc.ViewModels;
diff --git a/src/Orchard/ContentManagement/Handlers/BuildEditorModelContext.cs b/src/Orchard/ContentManagement/Handlers/BuildEditorModelContext.cs
index 5c948065f..a31cc1811 100644
--- a/src/Orchard/ContentManagement/Handlers/BuildEditorModelContext.cs
+++ b/src/Orchard/ContentManagement/Handlers/BuildEditorModelContext.cs
@@ -1,4 +1,3 @@
-using System.Linq;
using Orchard.ContentManagement.ViewModels;
using Orchard.Mvc.ViewModels;
diff --git a/src/Orchard/ContentManagement/Handlers/ContentItemBuilder.cs b/src/Orchard/ContentManagement/Handlers/ContentItemBuilder.cs
index 3ec2bbb59..4c6960eed 100644
--- a/src/Orchard/ContentManagement/Handlers/ContentItemBuilder.cs
+++ b/src/Orchard/ContentManagement/Handlers/ContentItemBuilder.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Orchard.ContentManagement.Handlers {
+namespace Orchard.ContentManagement.Handlers {
public class ContentItemBuilder {
private readonly ContentItem _item;
diff --git a/src/Orchard/ContentManagement/Handlers/TemplateFilterForRecord.cs b/src/Orchard/ContentManagement/Handlers/TemplateFilterForRecord.cs
index 1048db5aa..7e6d74347 100644
--- a/src/Orchard/ContentManagement/Handlers/TemplateFilterForRecord.cs
+++ b/src/Orchard/ContentManagement/Handlers/TemplateFilterForRecord.cs
@@ -1,5 +1,4 @@
using Orchard.ContentManagement.Records;
-using Orchard.ContentManagement.ViewModels;
namespace Orchard.ContentManagement.Handlers {
public class TemplateFilterForRecord : TemplateFilterBase> where TRecord : ContentPartRecord, new() {
diff --git a/src/Orchard/ContentManagement/Records/ContentItemRecord.cs b/src/Orchard/ContentManagement/Records/ContentItemRecord.cs
index 2cae18525..6b0d82d04 100644
--- a/src/Orchard/ContentManagement/Records/ContentItemRecord.cs
+++ b/src/Orchard/ContentManagement/Records/ContentItemRecord.cs
@@ -1,6 +1,4 @@
-using System;
using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
namespace Orchard.ContentManagement.Records {
public class ContentItemRecord {
diff --git a/src/Orchard/ContentManagement/Records/Utility.cs b/src/Orchard/ContentManagement/Records/Utility.cs
index b2ed2fbf7..f461aabcd 100644
--- a/src/Orchard/ContentManagement/Records/Utility.cs
+++ b/src/Orchard/ContentManagement/Records/Utility.cs
@@ -1,7 +1,4 @@
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
namespace Orchard.ContentManagement.Records {
public static class Utility {
diff --git a/src/Orchard/Data/TransactionManager.cs b/src/Orchard/Data/TransactionManager.cs
index 5a3a131ad..d39b9f6fa 100644
--- a/src/Orchard/Data/TransactionManager.cs
+++ b/src/Orchard/Data/TransactionManager.cs
@@ -1,7 +1,4 @@
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
using System.Transactions;
using System.Web.Mvc;
using Orchard.Logging;
diff --git a/src/Orchard/Environment/Configuration/AppDataFolder.cs b/src/Orchard/Environment/Configuration/AppDataFolder.cs
index fd235f784..1a07caa84 100644
--- a/src/Orchard/Environment/Configuration/AppDataFolder.cs
+++ b/src/Orchard/Environment/Configuration/AppDataFolder.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Web.Hosting;
diff --git a/src/Orchard/Environment/Configuration/ShellSettingsLoader.cs b/src/Orchard/Environment/Configuration/ShellSettingsLoader.cs
index 81a7a8091..ffca3df37 100644
--- a/src/Orchard/Environment/Configuration/ShellSettingsLoader.cs
+++ b/src/Orchard/Environment/Configuration/ShellSettingsLoader.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
-using System.Web.Hosting;
using Orchard.Localization;
using Yaml.Grammar;
diff --git a/src/Orchard/Environment/DefaultOrchardHost.cs b/src/Orchard/Environment/DefaultOrchardHost.cs
index d63ee1f85..1920db0a3 100644
--- a/src/Orchard/Environment/DefaultOrchardHost.cs
+++ b/src/Orchard/Environment/DefaultOrchardHost.cs
@@ -1,4 +1,3 @@
-using System;
using System.Linq;
using System.Web.Mvc;
using Autofac;
diff --git a/src/Orchard/Environment/HostContext.cs b/src/Orchard/Environment/HostContext.cs
index 71dbfccdc..c3d519690 100644
--- a/src/Orchard/Environment/HostContext.cs
+++ b/src/Orchard/Environment/HostContext.cs
@@ -1,4 +1,3 @@
-using System.Web;
using System.Web.Mvc;
using System.Web.Routing;
diff --git a/src/Orchard/Environment/OrchardStarter.cs b/src/Orchard/Environment/OrchardStarter.cs
index 60712d41d..e31677d95 100644
--- a/src/Orchard/Environment/OrchardStarter.cs
+++ b/src/Orchard/Environment/OrchardStarter.cs
@@ -1,10 +1,8 @@
using System;
-using System.Diagnostics;
using Autofac;
using Autofac.Builder;
using Autofac.Integration.Web;
using Autofac.Modules;
-using AutofacContrib.DynamicProxy2;
using Orchard.Environment.Configuration;
using Orchard.Environment.ShellBuilders;
using Orchard.Extensions;
diff --git a/src/Orchard/Environment/ServiceLocator.cs b/src/Orchard/Environment/ServiceLocator.cs
index 8575503ac..d0dd2bfe4 100644
--- a/src/Orchard/Environment/ServiceLocator.cs
+++ b/src/Orchard/Environment/ServiceLocator.cs
@@ -1,7 +1,4 @@
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
namespace Orchard.Environment {
public static class ServiceLocator {
diff --git a/src/Orchard/Extensions/ExtensionManager.cs b/src/Orchard/Extensions/ExtensionManager.cs
index 5c030f89d..f777662f4 100644
--- a/src/Orchard/Extensions/ExtensionManager.cs
+++ b/src/Orchard/Extensions/ExtensionManager.cs
@@ -7,7 +7,6 @@ using Orchard.Extensions.Helpers;
using Orchard.Extensions.Loaders;
using Orchard.Localization;
using Orchard.Logging;
-using Orchard.Utility;
using Yaml.Grammar;
using System.Web;
diff --git a/src/Orchard/IOrchardServices.cs b/src/Orchard/IOrchardServices.cs
index 908ed4392..39082e03d 100644
--- a/src/Orchard/IOrchardServices.cs
+++ b/src/Orchard/IOrchardServices.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Orchard.Data;
+using Orchard.Data;
using Orchard.ContentManagement;
using Orchard.Security;
using Orchard.UI.Notify;
diff --git a/src/Orchard/Localization/LocalizationModule.cs b/src/Orchard/Localization/LocalizationModule.cs
index a012ed9e2..ddb27ea2c 100644
--- a/src/Orchard/Localization/LocalizationModule.cs
+++ b/src/Orchard/Localization/LocalizationModule.cs
@@ -1,8 +1,5 @@
using System;
-using System.Collections.Generic;
-using System.Linq;
using System.Reflection;
-using System.Text;
using Module = Autofac.Builder.Module;
namespace Orchard.Localization {
diff --git a/src/Orchard/Localization/LocalizationUtilities.cs b/src/Orchard/Localization/LocalizationUtilities.cs
index cd9abce9c..df706fb29 100644
--- a/src/Orchard/Localization/LocalizationUtilities.cs
+++ b/src/Orchard/Localization/LocalizationUtilities.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Web.Mvc;
+using System.Web.Mvc;
using Autofac;
using Orchard.Mvc;
diff --git a/src/Orchard/Mvc/Routes/DefaultRouteProvider.cs b/src/Orchard/Mvc/Routes/DefaultRouteProvider.cs
index 12d53dd67..5a087e396 100644
--- a/src/Orchard/Mvc/Routes/DefaultRouteProvider.cs
+++ b/src/Orchard/Mvc/Routes/DefaultRouteProvider.cs
@@ -1,7 +1,5 @@
using System;
using System.Collections.Generic;
-using System.Linq;
-using System.Text;
using System.Web;
using System.Web.Mvc;
using System.Web.Routing;
diff --git a/src/Orchard/Mvc/Routes/RouteExtensions.cs b/src/Orchard/Mvc/Routes/RouteExtensions.cs
index 4258172cd..a55bef517 100644
--- a/src/Orchard/Mvc/Routes/RouteExtensions.cs
+++ b/src/Orchard/Mvc/Routes/RouteExtensions.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Orchard.Mvc.Routes {
+namespace Orchard.Mvc.Routes {
public static class RouteExtensions {
}
diff --git a/src/Orchard/Mvc/ViewEngines/LayoutView.cs b/src/Orchard/Mvc/ViewEngines/LayoutView.cs
index 9997229fa..640f299c9 100644
--- a/src/Orchard/Mvc/ViewEngines/LayoutView.cs
+++ b/src/Orchard/Mvc/ViewEngines/LayoutView.cs
@@ -1,13 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
+using System.IO;
using System.Web.Mvc;
using Orchard.Mvc.ViewModels;
-using Orchard.Security;
-using Orchard.UI.Navigation;
-using Orchard.UI.Notify;
-using Orchard.UI.Zones;
namespace Orchard.Mvc.ViewEngines {
public class LayoutView : IView {
diff --git a/src/Orchard/Mvc/ViewEngines/LayoutViewContext.cs b/src/Orchard/Mvc/ViewEngines/LayoutViewContext.cs
index 7724e4ea0..c63bee87c 100644
--- a/src/Orchard/Mvc/ViewEngines/LayoutViewContext.cs
+++ b/src/Orchard/Mvc/ViewEngines/LayoutViewContext.cs
@@ -1,10 +1,7 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
using System.IO;
-using System.Text;
using System.Web;
using System.Web.Mvc;
-using System.Web.UI;
namespace Orchard.Mvc.ViewEngines {
public class LayoutViewContext {
diff --git a/src/Orchard/Mvc/ViewEngines/LayoutViewEngine.cs b/src/Orchard/Mvc/ViewEngines/LayoutViewEngine.cs
index c5d3e8186..8ce81a97e 100644
--- a/src/Orchard/Mvc/ViewEngines/LayoutViewEngine.cs
+++ b/src/Orchard/Mvc/ViewEngines/LayoutViewEngine.cs
@@ -1,7 +1,6 @@
using System;
using System.Linq;
using System.Web.Mvc;
-using Orchard.Mvc.ViewModels;
using Orchard.Themes;
namespace Orchard.Mvc.ViewEngines {
diff --git a/src/Orchard/Orchard.csproj b/src/Orchard/Orchard.csproj
index 26feb9232..4bc73b0fd 100644
--- a/src/Orchard/Orchard.csproj
+++ b/src/Orchard/Orchard.csproj
@@ -55,8 +55,6 @@
False
..\..\lib\sharpziplib\ICSharpCode.SharpZipLib.dll
-
-
False
..\..\lib\fluentnhibernate\NHibernate.dll
@@ -85,14 +83,6 @@
3.5
-
- 3.5
-
-
- 3.5
-
-
-
False
..\..\lib\yaml\Yaml.dll
diff --git a/src/Orchard/Security/IAuthorizationServiceEvents.cs b/src/Orchard/Security/IAuthorizationServiceEvents.cs
index 472ac325d..def7998ae 100644
--- a/src/Orchard/Security/IAuthorizationServiceEvents.cs
+++ b/src/Orchard/Security/IAuthorizationServiceEvents.cs
@@ -1,4 +1,3 @@
-using System;
using Orchard.ContentManagement;
using Orchard.Security.Permissions;
diff --git a/src/Orchard/Security/Permissions/Permission.cs b/src/Orchard/Security/Permissions/Permission.cs
index 200fe8f8f..ce7da2984 100644
--- a/src/Orchard/Security/Permissions/Permission.cs
+++ b/src/Orchard/Security/Permissions/Permission.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
namespace Orchard.Security.Permissions {
public class Permission {
diff --git a/src/Orchard/Security/SecurityFilter.cs b/src/Orchard/Security/SecurityFilter.cs
index 79a3030fc..8457b276a 100644
--- a/src/Orchard/Security/SecurityFilter.cs
+++ b/src/Orchard/Security/SecurityFilter.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Linq;
-using System.Web.Mvc;
+using System.Web.Mvc;
using JetBrains.Annotations;
using Orchard.Logging;
using Orchard.Mvc.Filters;
diff --git a/src/Orchard/Security/SecurityModule.cs b/src/Orchard/Security/SecurityModule.cs
index f9f844c03..43cb074a9 100644
--- a/src/Orchard/Security/SecurityModule.cs
+++ b/src/Orchard/Security/SecurityModule.cs
@@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
-using System.Linq;
using System.Reflection;
using Autofac;
using AutofacContrib.DynamicProxy2;
diff --git a/src/Orchard/Security/StandardPermissions.cs b/src/Orchard/Security/StandardPermissions.cs
index f36b68f8c..b73f937a2 100644
--- a/src/Orchard/Security/StandardPermissions.cs
+++ b/src/Orchard/Security/StandardPermissions.cs
@@ -1,5 +1,4 @@
using System.Collections.Generic;
-using System.Linq;
using Orchard.Security.Permissions;
namespace Orchard.Security {
diff --git a/src/Orchard/Services/Clock.cs b/src/Orchard/Services/Clock.cs
index 5a2a551b7..038865060 100644
--- a/src/Orchard/Services/Clock.cs
+++ b/src/Orchard/Services/Clock.cs
@@ -1,7 +1,4 @@
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
namespace Orchard.Services {
public interface IClock : IDependency {
diff --git a/src/Orchard/Settings/SettingsModule.cs b/src/Orchard/Settings/SettingsModule.cs
index c026c3605..ddc8d67b2 100644
--- a/src/Orchard/Settings/SettingsModule.cs
+++ b/src/Orchard/Settings/SettingsModule.cs
@@ -4,7 +4,6 @@ using System.Reflection;
using Autofac;
using AutofacContrib.DynamicProxy2;
using Castle.Core.Interceptor;
-using Orchard.Security;
using Module = Autofac.Builder.Module;
namespace Orchard.Settings {
diff --git a/src/Orchard/UI/Notify/NotifierExtensions.cs b/src/Orchard/UI/Notify/NotifierExtensions.cs
index 425aab2e9..2290d9be4 100644
--- a/src/Orchard/UI/Notify/NotifierExtensions.cs
+++ b/src/Orchard/UI/Notify/NotifierExtensions.cs
@@ -1,4 +1,3 @@
-using System.Web.Mvc;
using Orchard.Localization;
namespace Orchard.UI.Notify {
diff --git a/src/Orchard/Utility/Reflect.cs b/src/Orchard/Utility/Reflect.cs
index 0c6bc0641..643a08d14 100644
--- a/src/Orchard/Utility/Reflect.cs
+++ b/src/Orchard/Utility/Reflect.cs
@@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
-using System.Collections.ObjectModel;
using System.Linq.Expressions;
using System.Reflection;
using System.Text;
diff --git a/src/Tools/MSBuild.Orchard.Tasks/MSBuild.Orchard.Tasks.csproj b/src/Tools/MSBuild.Orchard.Tasks/MSBuild.Orchard.Tasks.csproj
index 06cb2ebfb..769c71b5e 100644
--- a/src/Tools/MSBuild.Orchard.Tasks/MSBuild.Orchard.Tasks.csproj
+++ b/src/Tools/MSBuild.Orchard.Tasks/MSBuild.Orchard.Tasks.csproj
@@ -42,9 +42,6 @@
3.5
-
- 3.5
-