diff --git a/src/Orchard.Web/Modules/Orchard.Indexing/Orchard.Indexing.csproj b/src/Orchard.Web/Modules/Orchard.Indexing/Orchard.Indexing.csproj_
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Indexing/Orchard.Indexing.csproj
rename to src/Orchard.Web/Modules/Orchard.Indexing/Orchard.Indexing.csproj_
diff --git a/src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj b/src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj_
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj
rename to src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj_
diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj_
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj
rename to src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj_
diff --git a/src/Orchard.Web/Themes/Contoso/Views/Footer.ascx b/src/Orchard.Web/Themes/Contoso/Views/Footer.ascx
index 1b64bf9e1..1c95b2b9d 100644
--- a/src/Orchard.Web/Themes/Contoso/Views/Footer.ascx
+++ b/src/Orchard.Web/Themes/Contoso/Views/Footer.ascx
@@ -1,5 +1,4 @@
 <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %>
-<%@ Import Namespace="Orchard.Mvc.ViewModels" %>
 <div class="footer group">
     <ul class="group">
         <li>&copy;2010 <%: Html.SiteName() %>. All rights reserved.</li>
diff --git a/src/Orchard.Web/Themes/Contoso/Views/Layout.ascx b/src/Orchard.Web/Themes/Contoso/Views/Layout.ascx
index 03fea339f..48717e633 100644
--- a/src/Orchard.Web/Themes/Contoso/Views/Layout.ascx
+++ b/src/Orchard.Web/Themes/Contoso/Views/Layout.ascx
@@ -1,5 +1,4 @@
 <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %>
-<%@ Import Namespace="Orchard.Mvc.ViewModels"%>
 <%@ Import Namespace="Orchard.DisplayManagement.Shapes" %>
 
 <%
@@ -12,7 +11,7 @@
 
 <div id="container">
     <%-- Header --%>
-    <%: Display(Model.Header)) %>
+    <%: Display(Model.Header) %>
 	
 	<%-- Main Menu --%>
 	<div id="nav">
diff --git a/src/Orchard.Web/Themes/TheAdmin/Views/Header.ascx b/src/Orchard.Web/Themes/TheAdmin/Views/Header.ascx
index 5f60767b9..bdcb0ace4 100644
--- a/src/Orchard.Web/Themes/TheAdmin/Views/Header.ascx
+++ b/src/Orchard.Web/Themes/TheAdmin/Views/Header.ascx
@@ -1,4 +1,3 @@
 <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %>
-<%@ Import Namespace="Orchard.Mvc.ViewModels"%>
 <div id="app"><%: Html.ActionLink(T("Project Orchard").ToString(), "Index", new { Area = "", Controller = "Home" })%></div>
 <div id="site"><%: Html.ActionLink(T("Your Site").ToString(), "Index", new { Area = "", Controller = "Home" })%></div>
diff --git a/src/Orchard.Web/Themes/TheAdmin/Views/User.ascx b/src/Orchard.Web/Themes/TheAdmin/Views/User.ascx
index 93066e069..383633b39 100644
--- a/src/Orchard.Web/Themes/TheAdmin/Views/User.ascx
+++ b/src/Orchard.Web/Themes/TheAdmin/Views/User.ascx
@@ -1,5 +1,4 @@
 <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %>
-<%@ Import Namespace="Orchard.Mvc.ViewModels"%>
 <% if (Model.CurrentUser != null) {
     %><div id="login"><%: T("User:")%> <%: Model.CurrentUser.UserName %> | <%: Html.ActionLink(T("Logout").ToString(), "LogOff", new { Area = "Orchard.Users", Controller = "Account" }) %></div><%
    } %>
\ No newline at end of file
diff --git a/src/Orchard/ContentManagement/ContentExtensions.cs b/src/Orchard/ContentManagement/ContentExtensions.cs
index a83a5da3c..4b8e767a2 100644
--- a/src/Orchard/ContentManagement/ContentExtensions.cs
+++ b/src/Orchard/ContentManagement/ContentExtensions.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using Orchard.ContentManagement.Records;
-using Orchard.Mvc.ViewModels;
 
 namespace Orchard.ContentManagement {
     public static class ContentCreateExtensions {
diff --git a/src/Orchard/ContentManagement/DefaultContentManager.cs b/src/Orchard/ContentManagement/DefaultContentManager.cs
index 452ddd5a3..b75b13d6c 100644
--- a/src/Orchard/ContentManagement/DefaultContentManager.cs
+++ b/src/Orchard/ContentManagement/DefaultContentManager.cs
@@ -11,7 +11,6 @@ using Orchard.ContentManagement.Records;
 using Orchard.Data;
 using Orchard.DisplayManagement;
 using Orchard.Indexing;
-using Orchard.Mvc.ViewModels;
 
 namespace Orchard.ContentManagement {
     public class DefaultContentManager : IContentManager {
diff --git a/src/Orchard/ContentManagement/Drivers/ContentItemTemplateResult.cs b/src/Orchard/ContentManagement/Drivers/ContentItemTemplateResult.cs
index d36c59bd3..3419c0272 100644
--- a/src/Orchard/ContentManagement/Drivers/ContentItemTemplateResult.cs
+++ b/src/Orchard/ContentManagement/Drivers/ContentItemTemplateResult.cs
@@ -1,7 +1,6 @@
 using System.Linq;
 using System.Web.Mvc;
 using Orchard.ContentManagement.Handlers;
-using Orchard.Mvc.ViewModels;
 
 namespace Orchard.ContentManagement.Drivers {
     public class ContentItemTemplateResult<TContent> : DriverResult where TContent : class, IContent {
diff --git a/src/Orchard/ContentManagement/Handlers/BuildModelContext.cs b/src/Orchard/ContentManagement/Handlers/BuildModelContext.cs
index 678943ef5..d2bd798e4 100644
--- a/src/Orchard/ContentManagement/Handlers/BuildModelContext.cs
+++ b/src/Orchard/ContentManagement/Handlers/BuildModelContext.cs
@@ -1,4 +1,3 @@
-using System;
 using Orchard.DisplayManagement;
 
 namespace Orchard.ContentManagement.Handlers {
diff --git a/src/Orchard/ContentManagement/Handlers/ContentItemTemplates.cs b/src/Orchard/ContentManagement/Handlers/ContentItemTemplates.cs
index dd45ab59b..55c81a92c 100644
--- a/src/Orchard/ContentManagement/Handlers/ContentItemTemplates.cs
+++ b/src/Orchard/ContentManagement/Handlers/ContentItemTemplates.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Linq;
 using System.Web.Mvc;
-using Orchard.Mvc.ViewModels;
 
 namespace Orchard.ContentManagement.Handlers {
     public class ContentItemTemplates<TContent> : TemplateFilterBase<TContent> where TContent : class, IContent {
diff --git a/src/Orchard/ContentManagement/IContentManager.cs b/src/Orchard/ContentManagement/IContentManager.cs
index 2ae475a86..9fe5068dd 100644
--- a/src/Orchard/ContentManagement/IContentManager.cs
+++ b/src/Orchard/ContentManagement/IContentManager.cs
@@ -1,8 +1,6 @@
 using System.Collections.Generic;
 using Orchard.ContentManagement.MetaData.Models;
-using Orchard.DisplayManagement;
 using Orchard.Indexing;
-using Orchard.Mvc.ViewModels;
 
 namespace Orchard.ContentManagement {
     public interface IContentManager : IDependency {
diff --git a/src/Orchard/Mvc/Html/ContentItemDisplayExtensions.cs b/src/Orchard/Mvc/Html/ContentItemDisplayExtensions.cs
deleted file mode 100644
index 2d2ad3630..000000000
--- a/src/Orchard/Mvc/Html/ContentItemDisplayExtensions.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System;
-using System.Linq.Expressions;
-using System.Web.Mvc;
-using System.Web.Mvc.Html;
-using Orchard.Mvc.ViewModels;
-
-namespace Orchard.Mvc.Html {
- #if REFACTORING
-   public static class ContentItemDisplayExtensions {
-        public static MvcHtmlString DisplayForItem<TModel, TItemModel>(this HtmlHelper<TModel> html, TItemModel item) where TItemModel : ContentItemViewModel {
-            return html.DisplayForItem(x => item);
-        }
-
-        public static MvcHtmlString DisplayForItem<TModel, TItemModel>(this HtmlHelper<TModel> html, Expression<Func<TModel, TItemModel>> expression) where TItemModel : ContentItemViewModel {
-            var metadata = ModelMetadata.FromLambdaExpression(expression, html.ViewData);
-            var model = (TItemModel)metadata.Model;
-
-            if (model.Adaptor != null) {
-                return model.Adaptor(html, model).DisplayForModel(model.TemplateName, model.Prefix ?? "");
-            }
-
-            return html.DisplayFor(expression, model.TemplateName, model.Prefix ?? "");
-        }
-    }
-#endif
-}
\ No newline at end of file
diff --git a/src/Orchard/Mvc/Html/ContentItemEditorExtensions.cs b/src/Orchard/Mvc/Html/ContentItemEditorExtensions.cs
deleted file mode 100644
index 87b22ad98..000000000
--- a/src/Orchard/Mvc/Html/ContentItemEditorExtensions.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System;
-using System.Linq.Expressions;
-using System.Web.Mvc;
-using System.Web.Mvc.Html;
-using Orchard.Mvc.ViewModels;
-
-namespace Orchard.Mvc.Html {
-#if REFACTORING
-    public static class ContentItemEditorExtensions {
-        public static MvcHtmlString EditorForItem<TModel, TItemModel>(this HtmlHelper<TModel> html, TItemModel item) where TItemModel : ContentItemViewModel {
-            return html.EditorForItem(x => item);
-        }
-
-        public static MvcHtmlString EditorForItem<TModel, TItemModel>(this HtmlHelper<TModel> html, Expression<Func<TModel, TItemModel>> expression) where TItemModel : ContentItemViewModel {
-            var metadata = ModelMetadata.FromLambdaExpression(expression, html.ViewData);
-            var model = (TItemModel)metadata.Model;
-
-            if (model.Adaptor != null) {
-                return model.Adaptor(html, model).EditorForModel(model.TemplateName, model.Prefix ?? "");
-            }
-            
-            return html.EditorFor(expression, model.TemplateName, model.Prefix ?? "");
-        }
-    }
-#endif
-}
\ No newline at end of file
diff --git a/src/Orchard/Mvc/Html/HtmlHelperExtensions.cs b/src/Orchard/Mvc/Html/HtmlHelperExtensions.cs
index 57887f5ab..3a324643d 100644
--- a/src/Orchard/Mvc/Html/HtmlHelperExtensions.cs
+++ b/src/Orchard/Mvc/Html/HtmlHelperExtensions.cs
@@ -8,7 +8,6 @@ using System.Web.Mvc.Html;
 using System.Web.Routing;
 using Orchard.Collections;
 using Orchard.Localization;
-using Orchard.Mvc.ViewModels;
 using Orchard.Services;
 using Orchard.Settings;
 using Orchard.Utility;
@@ -422,40 +421,5 @@ namespace Orchard.Mvc.Html {
         }
 
         #endregion
-
-        #region AddRenderAction
-
-        public static void AddRenderAction(this HtmlHelper html, string location, string actionName) {
-            AddRenderActionHelper(html, location, actionName, null/*controllerName*/, null);
-        }
-        public static void AddRenderAction(this HtmlHelper html, string location, string actionName, object routeValues) {
-            AddRenderActionHelper(html, location, actionName, null/*controllerName*/, new RouteValueDictionary(routeValues));
-        }
-        public static void AddRenderAction(this HtmlHelper html, string location, string actionName, RouteValueDictionary routeValues) {
-            AddRenderActionHelper(html, location, actionName, null/*controllerName*/, routeValues);
-        }
-        public static void AddRenderAction(this HtmlHelper html, string location, string actionName, string controllerName) {
-            AddRenderActionHelper(html, location, actionName, controllerName, null/*RouteValueDictionary*/);
-        }
-        public static void AddRenderAction(this HtmlHelper html, string location, string actionName, string controllerName, object routeValues) {
-            AddRenderActionHelper(html, location, actionName, controllerName, new RouteValueDictionary(routeValues));
-        }
-        public static void AddRenderAction(this HtmlHelper html, string location, string actionName, string controllerName, RouteValueDictionary routeValues) {
-            AddRenderActionHelper(html, location, actionName, controllerName, routeValues);
-        }
-
-        private static void AddRenderActionHelper(this HtmlHelper html, string location, string actionName, string controllerName, RouteValueDictionary routeValues) {
-#if REFACTORING
-            // Retrieve the "BaseViewModel" for zones if we have one
-            var baseViewModel = BaseViewModel.From(html.ViewData);
-            if (baseViewModel == null)
-                return;
-
-            baseViewModel.Zones.AddRenderAction(location, actionName, controllerName, routeValues);
-#endif
-        }
-
-        #endregion
-
     }
 }
diff --git a/src/Orchard/Mvc/ViewModels/BaseViewModel.cs b/src/Orchard/Mvc/ViewModels/BaseViewModel.cs
deleted file mode 100644
index 847b1acef..000000000
--- a/src/Orchard/Mvc/ViewModels/BaseViewModel.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace Orchard.Mvc.ViewModels {
-    public class BaseViewModel {
-    }
-}
diff --git a/src/Orchard/Mvc/ViewModels/ContentItemViewModel.cs b/src/Orchard/Mvc/ViewModels/ContentItemViewModel.cs
deleted file mode 100644
index 11b255bd8..000000000
--- a/src/Orchard/Mvc/ViewModels/ContentItemViewModel.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-using System;
-using System.Web.Mvc;
-using Orchard.ContentManagement;
-using Orchard.UI.Zones;
-
-namespace Orchard.Mvc.ViewModels {
-#if REFACTORING
-    public class ContentItemViewModel : IZoneContainer {
-        private ContentItem _item;
-
-        public ContentItemViewModel() {
-            Zones = new ZoneCollection();
-        }
-
-        public ContentItemViewModel(ContentItem item) {
-            Zones = new ZoneCollection();
-            Item = item;
-        }
-
-        public ContentItemViewModel(ContentItemViewModel viewModel) {
-            TemplateName = viewModel.TemplateName;
-            Prefix = viewModel.Prefix;
-            Item = viewModel.Item;
-            Zones = viewModel.Zones;
-        }
-
-        public ContentItem Item {
-            get { return _item; }
-            private set { SetItem(value); }
-        }
-
-        protected virtual void SetItem(ContentItem value) {
-            _item = value;
-        }
-
-        public Func<HtmlHelper, ContentItemViewModel, HtmlHelper> Adaptor { get; set; }
-        public string TemplateName { get; set; }
-        public string Prefix { get; set; }
-        public ZoneCollection Zones { get; private set; }
-        public bool IsPublished {
-            get { return Item != null && Item.VersionRecord != null && Item.VersionRecord.Published; }
-        }
-        public bool IsLatest {
-            get { return Item != null && Item.VersionRecord != null && Item.VersionRecord.Latest; }
-        }
-        public bool IsDraft {
-            get { return IsLatest && !IsPublished; }
-        }
-    }
-
-    public class ContentItemViewModel<TPart> : ContentItemViewModel where TPart : IContent {
-        private TPart _item;
-
-        public ContentItemViewModel() {
-        }
-
-        public ContentItemViewModel(TPart content)
-            : base(content.ContentItem) {
-        }
-
-        public ContentItemViewModel(ContentItemViewModel viewModel)
-            : base(viewModel) {
-        }
-
-        public new TPart Item {
-            get { return _item; }
-        }
-
-        protected override void SetItem(ContentItem value) {
-            _item = value.As<TPart>();
-            base.SetItem(value);
-        }
-    }
-#endif
-}
\ No newline at end of file
diff --git a/src/Orchard/Orchard.Framework.csproj b/src/Orchard/Orchard.Framework.csproj
index b3aebb5bd..db1420352 100644
--- a/src/Orchard/Orchard.Framework.csproj
+++ b/src/Orchard/Orchard.Framework.csproj
@@ -153,7 +153,6 @@
     <Compile Include="Mvc\ViewEngines\ThemeAwareness\ThemeAwareViewEngine.cs" />
     <Compile Include="Mvc\ViewEngines\ThemeAwareness\ThemeAwareViewEngineShim.cs" />
     <Compile Include="Mvc\ViewEngines\ThemeAwareness\ViewEngineCollectionWrapper.cs" />
-    <Compile Include="Mvc\ViewModels\BaseViewModel.cs" />
     <Compile Include="Caching\Signals.cs" />
     <Compile Include="Collections\IPageOfItems.cs" />
     <Compile Include="Collections\PageOfItems.cs" />
@@ -659,7 +658,6 @@
     <Compile Include="Tasks\Scheduling\IPublishingTaskManager.cs" />
     <Compile Include="Tasks\Scheduling\IScheduledTask.cs" />
     <Compile Include="Localization\Text.cs" />
-    <Compile Include="Mvc\ViewModels\ContentItemViewModel.cs" />
     <Compile Include="Data\Conventions\AttributeCollectionConvention.cs" />
     <Compile Include="Data\Conventions\CascadeAllDeleteOrphanAttribute.cs" />
     <Compile Include="Data\TransactionManager.cs" />
@@ -708,8 +706,6 @@
     <Compile Include="Logging\NullLoggerFactory.cs" />
     <Compile Include="Mvc\Html\ContainerExtensions.cs" />
     <Compile Include="Mvc\Html\ContentItemExtensions.cs" />
-    <Compile Include="Mvc\Html\ContentItemDisplayExtensions.cs" />
-    <Compile Include="Mvc\Html\ContentItemEditorExtensions.cs" />
     <Compile Include="Mvc\Html\LayoutExtensions.cs" />
     <Compile Include="Mvc\MvcModule.cs" />
     <Compile Include="Mvc\Html\HtmlHelperExtensions.cs" />
@@ -738,7 +734,6 @@
     <Compile Include="UI\Resources\ResourceFilter.cs" />
     <Compile Include="UI\Resources\ResourceManager.cs" />
     <Compile Include="UI\Zones\Obsolete\DelegateZoneItem.cs" />
-    <Compile Include="UI\Zones\Obsolete\ContentItemDisplayZoneItem.cs" />
     <Compile Include="UI\Zones\Obsolete\IZoneManager.cs" />
     <Compile Include="UI\Zones\Obsolete\ContentPartDisplayZoneItem.cs" />
     <Compile Include="UI\Zones\Obsolete\ContentPartEditorZoneItem.cs" />
@@ -746,7 +741,6 @@
     <Compile Include="UI\Zones\Obsolete\RenderActionZoneItem.cs" />
     <Compile Include="UI\Zones\Obsolete\RenderPartialZoneItem.cs" />
     <Compile Include="UI\Zones\Obsolete\RenderStaticZoneItem.cs" />
-    <Compile Include="UI\Zones\Obsolete\ZoneCollection.cs" />
     <Compile Include="UI\Zones\Obsolete\ZoneEntry.cs" />
     <Compile Include="UI\Zones\Obsolete\ZoneItem.cs" />
     <Compile Include="Mvc\ViewPage.cs">
diff --git a/src/Orchard/UI/Admin/AdminFilter.cs b/src/Orchard/UI/Admin/AdminFilter.cs
index fb4c82dbc..3b756abfb 100644
--- a/src/Orchard/UI/Admin/AdminFilter.cs
+++ b/src/Orchard/UI/Admin/AdminFilter.cs
@@ -5,9 +5,7 @@ using System.Web.Mvc;
 using System.Web.Routing;
 using Orchard.Localization;
 using Orchard.Mvc.Filters;
-using Orchard.Mvc.ViewModels;
 using Orchard.Security;
-using Orchard.UI.Notify;
 
 namespace Orchard.UI.Admin {
     public class AdminFilter : FilterProvider, IAuthorizationFilter {