diff --git a/src/Orchard.Tests/ContentManagement/Handlers/Coordinators/ContentPartDriverCoordinatorTests.cs b/src/Orchard.Tests/ContentManagement/Handlers/Coordinators/ContentPartDriverCoordinatorTests.cs
index 5b9a249f6..9ce847028 100644
--- a/src/Orchard.Tests/ContentManagement/Handlers/Coordinators/ContentPartDriverCoordinatorTests.cs
+++ b/src/Orchard.Tests/ContentManagement/Handlers/Coordinators/ContentPartDriverCoordinatorTests.cs
@@ -93,14 +93,14 @@ namespace Orchard.Tests.ContentManagement.Handlers.Coordinators {
 
             protected override DriverResult Editor(StubPart part, dynamic shapeHelper) {
                 var viewModel = new StubViewModel { Foo = string.Join(",", part.Foo) };
-                return ContentPartTemplate(viewModel).Location("last", "10");
+                return new ContentTemplateResult(viewModel, null, Prefix).Location("last", "10");
             }
 
             protected override DriverResult Editor(StubPart part, IUpdateModel updater, dynamic shapeHelper) {
                 var viewModel = new StubViewModel { Foo = string.Join(",", part.Foo) };
                 updater.TryUpdateModel(viewModel, Prefix, null, null);
                 part.Foo = viewModel.Foo.Split(new[] { ',' }).Select(x => x.Trim()).ToArray();
-                return ContentPartTemplate(viewModel).Location("last", "10");
+                return new ContentTemplateResult(viewModel, null, Prefix).Location("last", "10");
             }
         }
 
diff --git a/src/Orchard/ContentManagement/Drivers/AutomaticContentPartDriver.cs b/src/Orchard/ContentManagement/Drivers/AutomaticContentPartDriver.cs
deleted file mode 100644
index d0f2ef076..000000000
--- a/src/Orchard/ContentManagement/Drivers/AutomaticContentPartDriver.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-namespace Orchard.ContentManagement.Drivers {
-    public abstract class AutomaticContentPartDriver<TPart> : ContentPartDriver<TPart> where TPart : ContentPart, new() {
-        protected override string Prefix {
-            get {
-                return (typeof (TPart).Name);
-            }
-        }
-
-        protected override DriverResult Display(TPart part, string displayType, dynamic shapeHelper) {
-            return ContentPartTemplate(part);
-        }
-        
-        protected override DriverResult Editor(TPart part, dynamic shapeHelper) {
-            return ContentPartTemplate(part);
-        }
-        
-        protected override DriverResult Editor(TPart part, IUpdateModel updater, dynamic shapeHelper) {
-            updater.TryUpdateModel(part, Prefix, null, null);
-            return ContentPartTemplate(part);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Orchard/ContentManagement/Drivers/ContentPartDriver.cs b/src/Orchard/ContentManagement/Drivers/ContentPartDriver.cs
index 7506aa975..6e274ef20 100644
--- a/src/Orchard/ContentManagement/Drivers/ContentPartDriver.cs
+++ b/src/Orchard/ContentManagement/Drivers/ContentPartDriver.cs
@@ -58,19 +58,6 @@ namespace Orchard.ContentManagement.Drivers {
             return shapeFactory.Create(shapeType);
         }
 
-        [Obsolete]
-        public ContentTemplateResult ContentPartTemplate(object model) {
-            return new ContentTemplateResult(model, null, Prefix).Location(Zone);
-        }
-        [Obsolete]
-        public ContentTemplateResult ContentPartTemplate(object model, string template) {
-            return new ContentTemplateResult(model, template, Prefix).Location(Zone);
-        }
-        [Obsolete]
-        public ContentTemplateResult ContentPartTemplate(object model, string template, string prefix) {
-            return new ContentTemplateResult(model, template, prefix).Location(Zone);
-        }
-
         public CombinedResult Combined(params DriverResult[] results) {
             return new CombinedResult(results);
         }
diff --git a/src/Orchard/Orchard.Framework.csproj b/src/Orchard/Orchard.Framework.csproj
index c533a8e82..ba6bd74ad 100644
--- a/src/Orchard/Orchard.Framework.csproj
+++ b/src/Orchard/Orchard.Framework.csproj
@@ -235,9 +235,6 @@
     <Compile Include="ContentManagement\DefaultContentQuery.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="ContentManagement\Drivers\AutomaticContentPartDriver.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="ContentManagement\Drivers\CombinedResult.cs">
       <SubType>Code</SubType>
     </Compile>