diff --git a/src/Umbraco.Core/CoreBootManager.cs b/src/Umbraco.Core/CoreBootManager.cs
index 1dee621091..f440626df1 100644
--- a/src/Umbraco.Core/CoreBootManager.cs
+++ b/src/Umbraco.Core/CoreBootManager.cs
@@ -127,7 +127,7 @@ namespace Umbraco.Core
             // completed at the end of the boot process to allow garbage collection
             _appStartupEvtContainer = Container.CreateChildContainer();
             _appStartupEvtContainer.BeginScope();
-            _appStartupEvtContainer.RegisterCollection<IApplicationEventHandler, PerScopeLifetime>(PluginManager.ResolveApplicationStartupHandlers());
+            _appStartupEvtContainer.RegisterCollection<PerScopeLifetime>(PluginManager.ResolveApplicationStartupHandlers());
             
             //build up standard IoC services
             ConfigureApplicationServices(Container);
diff --git a/src/Umbraco.Core/DatabaseContext.cs b/src/Umbraco.Core/DatabaseContext.cs
index 77ef7c626d..1f00fb0df9 100644
--- a/src/Umbraco.Core/DatabaseContext.cs
+++ b/src/Umbraco.Core/DatabaseContext.cs
@@ -30,7 +30,6 @@ namespace Umbraco.Core
         private readonly ILogger _logger;
         private readonly SqlSyntaxProviders _syntaxProviders;
         private bool _configured;
-        private readonly object _locker = new object();
         private string _connectionString;
         private string _providerName;
         private DatabaseSchemaResult _result;
diff --git a/src/Umbraco.Core/DependencyInjection/LightInjectExtensions.cs b/src/Umbraco.Core/DependencyInjection/LightInjectExtensions.cs
index d66a446ae2..f80d5fdaf4 100644
--- a/src/Umbraco.Core/DependencyInjection/LightInjectExtensions.cs
+++ b/src/Umbraco.Core/DependencyInjection/LightInjectExtensions.cs
@@ -9,11 +9,10 @@ namespace Umbraco.Core.DependencyInjection
         /// <summary>
         /// In order for LightInject to deal with enumerables of the same type, each one needs to be named individually
         /// </summary>
-        /// <typeparam name="TService"></typeparam>
         /// <typeparam name="TLifetime"></typeparam>
         /// <param name="container"></param>
         /// <param name="implementationTypes"></param>
-        public static void RegisterCollection<TService, TLifetime>(this IServiceContainer container, IEnumerable<Type> implementationTypes)
+        public static void RegisterCollection<TLifetime>(this IServiceContainer container, IEnumerable<Type> implementationTypes)
             where TLifetime : ILifetime
         {
             var i = 0;
@@ -39,10 +38,9 @@ namespace Umbraco.Core.DependencyInjection
         /// <summary>
         /// In order for LightInject to deal with enumerables of the same type, each one needs to be named individually
         /// </summary>
-        /// <typeparam name="TService"></typeparam>
         /// <param name="container"></param>
         /// <param name="implementationTypes"></param>
-        public static void RegisterCollection<TService>(this IServiceContainer container, IEnumerable<Type> implementationTypes)
+        public static void RegisterCollection(this IServiceContainer container, IEnumerable<Type> implementationTypes)
         {
             var i = 0;
             foreach (var type in implementationTypes)
diff --git a/src/Umbraco.Core/Media/Exif/ExifProperty.cs b/src/Umbraco.Core/Media/Exif/ExifProperty.cs
index 16ae5bc08e..7ba32d4966 100644
--- a/src/Umbraco.Core/Media/Exif/ExifProperty.cs
+++ b/src/Umbraco.Core/Media/Exif/ExifProperty.cs
@@ -27,7 +27,7 @@ namespace Umbraco.Core.Media.Exif
         {
             get
             {
-                if (mName == null || mName.Length == 0)
+                if (string.IsNullOrEmpty(mName))
                     return ExifTagFactory.GetTagName(mTag);
                 else
                     return mName;
diff --git a/src/Umbraco.Core/Models/Membership/UmbracoMembershipUser.cs b/src/Umbraco.Core/Models/Membership/UmbracoMembershipUser.cs
deleted file mode 100644
index ada2a7102d..0000000000
--- a/src/Umbraco.Core/Models/Membership/UmbracoMembershipUser.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using System;
-using System.Web.Security;
-
-namespace Umbraco.Core.Models.Membership
-{
-    internal class UmbracoMembershipUser<T> : MembershipUser where T : IMembershipUser
-    {
-        private T _user;
-
-        #region Constructors
-        /// <summary>
-        /// Initializes a new instance of the <see cref="UmbracoMembershipUser{T}"/> class.
-        /// </summary>
-        public UmbracoMembershipUser(T user)
-        {
-            _user = user;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="UmbracoMembershipUser{T}"/> class.
-        /// </summary>
-        /// <param name="providerName">Name of the provider.</param>
-        /// <param name="name">The name.</param>
-        /// <param name="providerUserKey">The provider user key.</param>
-        /// <param name="email">The email.</param>
-        /// <param name="passwordQuestion">The password question.</param>
-        /// <param name="comment">The comment.</param>
-        /// <param name="isApproved">if set to <c>true</c> [is approved].</param>
-        /// <param name="isLockedOut">if set to <c>true</c> [is locked out].</param>
-        /// <param name="creationDate">The creation date.</param>
-        /// <param name="lastLoginDate">The last login date.</param>
-        /// <param name="lastActivityDate">The last activity date.</param>
-        /// <param name="lastPasswordChangedDate">The last password changed date.</param>
-        /// <param name="lastLockoutDate">The last lockout date.</param>
-        /// <param name="fullName">The full name.</param>
-        /// <param name="language">The language.</param>
-        /// <param name="userType">Type of the user.</param>
-        /// <param name="user"></param>
-        public UmbracoMembershipUser(string providerName, string name, object providerUserKey, string email, 
-            string passwordQuestion, string comment, bool isApproved, bool isLockedOut, 
-            DateTime creationDate, DateTime lastLoginDate, DateTime lastActivityDate, DateTime lastPasswordChangedDate,
-            DateTime lastLockoutDate, string fullName, string language, IUserType userType, T user) 
-            : base( providerName, name, providerUserKey, email, passwordQuestion, comment, isApproved, isLockedOut, 
-                creationDate, lastLoginDate, lastActivityDate, lastPasswordChangedDate, lastLockoutDate)
-        {
-            _user = user;
-        }
-
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Models/Script.cs b/src/Umbraco.Core/Models/Script.cs
index 325885d9ba..0c6eed39dd 100644
--- a/src/Umbraco.Core/Models/Script.cs
+++ b/src/Umbraco.Core/Models/Script.cs
@@ -18,12 +18,7 @@ namespace Umbraco.Core.Models
 
         internal Script(string path, Func<File, string> getFileContent)
             : base(path, getFileContent)
-        { }
-
-        [Obsolete("This is no longer used and will be removed from the codebase in future versions")]
-        public Script(string path, IContentSection contentConfig)
-            : base(path)
-        { }
+        { }      
 
         /// <summary>
         /// Indicates whether the current entity has an identity, which in this case is a path/name.
diff --git a/src/Umbraco.Core/Models/Template.cs b/src/Umbraco.Core/Models/Template.cs
index 4aca88f286..b5730ae11a 100644
--- a/src/Umbraco.Core/Models/Template.cs
+++ b/src/Umbraco.Core/Models/Template.cs
@@ -43,12 +43,6 @@ namespace Umbraco.Core.Models
             _masterTemplateId = new Lazy<int>(() => -1);
         }
 
-        [Obsolete("This constructor should not be used, file path is determined by alias, setting the path here will have no affect")]
-        public Template(string path, string name, string alias)
-            : this(name, alias)
-        {            
-        }
-
         [DataMember]
         public Lazy<int> MasterTemplateId
         {
diff --git a/src/Umbraco.Core/ObjectResolution/ResolverBase.cs b/src/Umbraco.Core/ObjectResolution/ResolverBase.cs
index b0c4d21998..b5e1e14df2 100644
--- a/src/Umbraco.Core/ObjectResolution/ResolverBase.cs
+++ b/src/Umbraco.Core/ObjectResolution/ResolverBase.cs
@@ -49,12 +49,6 @@ namespace Umbraco.Core.ObjectResolution
 
 	    }
 
-        internal ResolverBase(IServiceContainer container)
-            : base(() => Reset())
-	    {
-	        
-	    }
-
 	    /// <summary>
 		/// Gets or sets the resolver singleton instance.
 		/// </summary>
diff --git a/src/Umbraco.Core/Packaging/PackageInstallation.cs b/src/Umbraco.Core/Packaging/PackageInstallation.cs
index 3540c166c2..d2100f9738 100644
--- a/src/Umbraco.Core/Packaging/PackageInstallation.cs
+++ b/src/Umbraco.Core/Packaging/PackageInstallation.cs
@@ -97,7 +97,7 @@ namespace Umbraco.Core.Packaging
             try
             {
                 XElement rootElement = GetConfigXmlElement(packageFilePath);
-                return GetPreInstallWarnings(packageFilePath, rootElement);
+                return GetPreInstallWarnings(rootElement);
             }
             catch (Exception e)
             {
@@ -169,7 +169,7 @@ namespace Umbraco.Core.Packaging
                 var documentTypesInstalled = EmptyEnumerableIfNull<IContentType>(documentTypes) ?? InstallDocumentTypes(documentTypes, userId);
                 installationSummary.ContentTypesInstalled =documentTypesInstalled;
 
-                var stylesheetsInstalled = EmptyEnumerableIfNull<IFile>(styleSheets) ?? InstallStylesheets(styleSheets, userId);
+                var stylesheetsInstalled = EmptyEnumerableIfNull<IFile>(styleSheets) ?? InstallStylesheets(styleSheets);
                 installationSummary.StylesheetsInstalled = stylesheetsInstalled;
 
                 var documentsInstalled = documents != null ? InstallDocuments(documents, userId) 
@@ -328,7 +328,7 @@ namespace Umbraco.Core.Packaging
                     .ToArray();
         }
 
-        private IEnumerable<IFile> InstallStylesheets(XElement styleSheetsElement, int userId = 0)
+        private IEnumerable<IFile> InstallStylesheets(XElement styleSheetsElement)
         {
             if (string.Equals(Constants.Packaging.StylesheetsNodeName, styleSheetsElement.Name.LocalName) == false)
             {
@@ -425,7 +425,7 @@ namespace Umbraco.Core.Packaging
             return _packagingService.ImportDataTypeDefinitions(dataTypeElements, userId);
         }
 
-        private PreInstallWarnings GetPreInstallWarnings(string packagePath, XElement rootElement)
+        private PreInstallWarnings GetPreInstallWarnings(XElement rootElement)
         {
             XElement files = rootElement.Element(Constants.Packaging.FilesNodeName);
             XElement styleSheets = rootElement.Element(Constants.Packaging.StylesheetsNodeName);
diff --git a/src/Umbraco.Core/Persistence/SqlSyntax/DbTypes.cs b/src/Umbraco.Core/Persistence/SqlSyntax/DbTypes.cs
index 507db230cc..e744fb7fdf 100644
--- a/src/Umbraco.Core/Persistence/SqlSyntax/DbTypes.cs
+++ b/src/Umbraco.Core/Persistence/SqlSyntax/DbTypes.cs
@@ -4,8 +4,7 @@ using System.Data;
 
 namespace Umbraco.Core.Persistence.SqlSyntax
 {
-    public class DbTypes<TSyntax>
-        where TSyntax : ISqlSyntaxProvider
+    public class DbTypes
     {
         public DbType DbType;
         public string TextDefinition;
diff --git a/src/Umbraco.Core/Persistence/SqlSyntax/SqlSyntaxProviderBase.cs b/src/Umbraco.Core/Persistence/SqlSyntax/SqlSyntaxProviderBase.cs
index c2b81aa753..eb8a56faca 100644
--- a/src/Umbraco.Core/Persistence/SqlSyntax/SqlSyntaxProviderBase.cs
+++ b/src/Umbraco.Core/Persistence/SqlSyntax/SqlSyntaxProviderBase.cs
@@ -72,7 +72,7 @@ namespace Umbraco.Core.Persistence.SqlSyntax
 
         protected IList<Func<ColumnDefinition, string>> ClauseOrder { get; set; }
 
-        protected DbTypes<TSyntax> DbTypeMap = new DbTypes<TSyntax>();
+        protected DbTypes DbTypeMap = new DbTypes();
         protected void InitColumnTypeMap()
         {
             DbTypeMap.Set<string>(DbType.String, StringColumnDefinition);
diff --git a/src/Umbraco.Core/Services/PackagingService.cs b/src/Umbraco.Core/Services/PackagingService.cs
index 2d7445ee5e..8244e90d52 100644
--- a/src/Umbraco.Core/Services/PackagingService.cs
+++ b/src/Umbraco.Core/Services/PackagingService.cs
@@ -1379,7 +1379,7 @@ namespace Umbraco.Core.Services
                 var path = isMasterPage ? MasterpagePath(alias) : ViewPath(alias);
 
                 var existingTemplate = _fileService.GetTemplate(alias) as Template;
-                var template = existingTemplate ?? new Template(path, templateName, alias);
+                var template = existingTemplate ?? new Template(templateName, alias);
                 template.Content = design;
                 if (masterElement != null && string.IsNullOrEmpty(masterElement.Value) == false)
                 {
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 03411a49e2..7f51f4324a 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -683,7 +683,6 @@
     <Compile Include="Models\Member.cs" />
     <Compile Include="Models\Membership\MembershipUserExtensions.cs" />
     <Compile Include="Models\Membership\UmbracoMembershipMember.cs" />
-    <Compile Include="Models\Membership\UmbracoMembershipUser.cs" />
     <Compile Include="Models\PagedResult.cs" />
     <Compile Include="Models\PreValue.cs" />
     <Compile Include="Models\MemberType.cs" />
diff --git a/src/Umbraco.Tests/Models/ContentTests.cs b/src/Umbraco.Tests/Models/ContentTests.cs
index 6bc61649a5..f2120fb235 100644
--- a/src/Umbraco.Tests/Models/ContentTests.cs
+++ b/src/Umbraco.Tests/Models/ContentTests.cs
@@ -210,7 +210,7 @@ namespace Umbraco.Tests.Models
             content.ReleaseDate = DateTime.Now;
             content.ChangePublishedState(PublishedState.Published);
             content.SortOrder = 5;
-            content.Template = new Template("-1,2,3,4", "Test Template", "testTemplate")
+            content.Template = new Template((string) "Test Template", (string) "testTemplate")
             {
                 Id = 88
             };
@@ -265,7 +265,7 @@ namespace Umbraco.Tests.Models
             content.ReleaseDate = DateTime.Now;
             content.ChangePublishedState(PublishedState.Published);
             content.SortOrder = 5;
-            content.Template = new Template("-1,2,3,4", "Test Template", "testTemplate")
+            content.Template = new Template((string) "Test Template", (string) "testTemplate")
             {
                 Id = 88
             };
@@ -368,7 +368,7 @@ namespace Umbraco.Tests.Models
             content.ReleaseDate = DateTime.Now;
             content.ChangePublishedState(PublishedState.Published);
             content.SortOrder = 5;
-            content.Template = new Template("-1,2,3,4", "Test Template", "testTemplate")
+            content.Template = new Template((string) "Test Template", (string) "testTemplate")
             {
                 Id = 88
             };
diff --git a/src/Umbraco.Tests/Models/ContentTypeTests.cs b/src/Umbraco.Tests/Models/ContentTypeTests.cs
index 0589d7d173..70208c3424 100644
--- a/src/Umbraco.Tests/Models/ContentTypeTests.cs
+++ b/src/Umbraco.Tests/Models/ContentTypeTests.cs
@@ -47,12 +47,12 @@ namespace Umbraco.Tests.Models
             contentType.PropertyTypeCollection.Add(
                 new PropertyType("test", DataTypeDatabaseType.Ntext, "title2") { Name = "Title2", Description = "", Mandatory = false, SortOrder = 1, DataTypeDefinitionId = -88 });
 
-            contentType.AllowedTemplates = new[] { new Template("-1,2", "Name", "name") { Id = 200 }, new Template("-1,3", "Name2", "name2") { Id = 201 } };
+            contentType.AllowedTemplates = new[] { new Template("Name", "name") { Id = 200 }, new Template("Name2", "name2") { Id = 201 } };
             contentType.AllowedContentTypes = new[] { new ContentTypeSort(new Lazy<int>(() => 888), 8, "sub"), new ContentTypeSort(new Lazy<int>(() => 889), 9, "sub2") };
             contentType.Id = 10;
             contentType.CreateDate = DateTime.Now;
             contentType.CreatorId = 22;
-            contentType.SetDefaultTemplate(new Template("-1,2,3,4", "Test Template", "testTemplate")
+            contentType.SetDefaultTemplate(new Template((string) "Test Template", (string) "testTemplate")
             {
                 Id = 88
             });
@@ -108,12 +108,12 @@ namespace Umbraco.Tests.Models
             {
                 group.Id = ++i;
             }
-            contentType.AllowedTemplates = new[] { new Template("-1,2", "Name", "name") { Id = 200 }, new Template("-1,3", "Name2", "name2") { Id = 201 } };
+            contentType.AllowedTemplates = new[] { new Template((string) "Name", (string) "name") { Id = 200 }, new Template((string) "Name2", (string) "name2") { Id = 201 } };
             contentType.AllowedContentTypes = new[] { new ContentTypeSort(new Lazy<int>(() => 888), 8, "sub"), new ContentTypeSort(new Lazy<int>(() => 889), 9, "sub2") };
             contentType.Id = 10;
             contentType.CreateDate = DateTime.Now;
             contentType.CreatorId = 22;
-            contentType.SetDefaultTemplate(new Template("-1,2,3,4", "Test Template", "testTemplate")
+            contentType.SetDefaultTemplate(new Template((string) "Test Template", (string) "testTemplate")
             {
                 Id = 88
             });
@@ -159,12 +159,12 @@ namespace Umbraco.Tests.Models
             {
                 group.Id = ++i;
             }
-            contentType.AllowedTemplates = new[] { new Template("-1,2", "Name", "name") { Id = 200 }, new Template("-1,3", "Name2", "name2") { Id = 201 } };
+            contentType.AllowedTemplates = new[] { new Template((string) "Name", (string) "name") { Id = 200 }, new Template((string) "Name2", (string) "name2") { Id = 201 } };
             contentType.AllowedContentTypes = new[] {new ContentTypeSort(new Lazy<int>(() => 888), 8, "sub"), new ContentTypeSort(new Lazy<int>(() => 889), 9, "sub2")};
             contentType.Id = 10;
             contentType.CreateDate = DateTime.Now;
             contentType.CreatorId = 22;
-            contentType.SetDefaultTemplate(new Template("-1,2,3,4", "Test Template", "testTemplate")
+            contentType.SetDefaultTemplate(new Template((string) "Test Template", (string) "testTemplate")
             {
                 Id = 88
             });            
@@ -260,12 +260,12 @@ namespace Umbraco.Tests.Models
             {
                 propertyType.Id = ++i;
             }
-            contentType.AllowedTemplates = new[] { new Template("-1,2", "Name", "name") { Id = 200 }, new Template("-1,3", "Name2", "name2") { Id = 201 } };
+            contentType.AllowedTemplates = new[] { new Template((string) "Name", (string) "name") { Id = 200 }, new Template((string) "Name2", (string) "name2") { Id = 201 } };
             contentType.AllowedContentTypes = new[] { new ContentTypeSort(new Lazy<int>(() => 888), 8, "sub"), new ContentTypeSort(new Lazy<int>(() => 889), 9, "sub2") };
             contentType.Id = 10;
             contentType.CreateDate = DateTime.Now;
             contentType.CreatorId = 22;
-            contentType.SetDefaultTemplate(new Template("-1,2,3,4", "Test Template", "testTemplate")
+            contentType.SetDefaultTemplate(new Template((string) "Test Template", (string) "testTemplate")
             {
                 Id = 88
             });
diff --git a/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs
index 9729533af9..281434c544 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs
@@ -81,9 +81,9 @@ namespace Umbraco.Tests.Persistence.Repositories
             {
                 var templates = new[]
                 {
-                    new Template("test1.cshtml", "test1", "test1"),
-                    new Template("test2.cshtml", "test2", "test2"),
-                    new Template("test3.cshtml", "test3", "test3")
+                    new Template("test1", "test1"),
+                    new Template("test2", "test2"),
+                    new Template("test3", "test3")
                 };
                 foreach (var template in templates)
                 {
diff --git a/src/Umbraco.Tests/Plugins/TypeHelperTests.cs b/src/Umbraco.Tests/Plugins/TypeHelperTests.cs
index 9282d7cd48..be7ed38915 100644
--- a/src/Umbraco.Tests/Plugins/TypeHelperTests.cs
+++ b/src/Umbraco.Tests/Plugins/TypeHelperTests.cs
@@ -25,8 +25,6 @@ namespace Umbraco.Tests.Plugins
     public class TypeHelperTests
     {
 
-   
-
 
         class Base<T> { }
 
diff --git a/src/Umbraco.Tests/PublishedContent/DynamicDocumentTestsBase.cs b/src/Umbraco.Tests/PublishedContent/DynamicDocumentTestsBase.cs
index a5f2be45ab..55489b6074 100644
--- a/src/Umbraco.Tests/PublishedContent/DynamicDocumentTestsBase.cs
+++ b/src/Umbraco.Tests/PublishedContent/DynamicDocumentTestsBase.cs
@@ -15,7 +15,7 @@ using Umbraco.Tests.TestHelpers;
 namespace Umbraco.Tests.PublishedContent
 {
 	[TestFixture]
-    public abstract class DynamicDocumentTestsBase<TDocument, TDocumentList> : PublishedContentTestBase
+    public abstract class DynamicDocumentTestsBase<TDocument> : PublishedContentTestBase
 	{
         private IUmbracoSettingsSection _umbracoSettings;
 
diff --git a/src/Umbraco.Tests/PublishedContent/DynamicPublishedContentTests.cs b/src/Umbraco.Tests/PublishedContent/DynamicPublishedContentTests.cs
index 106996a93e..143cf95321 100644
--- a/src/Umbraco.Tests/PublishedContent/DynamicPublishedContentTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/DynamicPublishedContentTests.cs
@@ -13,7 +13,7 @@ using File = Umbraco.Core.Models.File;
 namespace Umbraco.Tests.PublishedContent
 {
     [TestFixture]
-	public class DynamicPublishedContentTests : DynamicDocumentTestsBase<DynamicPublishedContent, DynamicPublishedContentList>
+	public class DynamicPublishedContentTests : DynamicDocumentTestsBase<DynamicPublishedContent>
 	{
 		internal DynamicPublishedContent GetNode(int id)
 		{
diff --git a/src/Umbraco.Tests/Resolvers/LazyManyObjectResolverTests.cs b/src/Umbraco.Tests/Resolvers/LazyManyObjectResolverTests.cs
index 33bb1ab34c..9fcfdfe382 100644
--- a/src/Umbraco.Tests/Resolvers/LazyManyObjectResolverTests.cs
+++ b/src/Umbraco.Tests/Resolvers/LazyManyObjectResolverTests.cs
@@ -171,11 +171,7 @@ namespace Umbraco.Tests.Resolvers
 
 		private sealed class LazyResolver : LazyManyObjectsResolverBase<LazyResolver, ITestInterface>
 		{
-			public LazyResolver(IServiceProvider serviceProvider, ILogger logger)
-                : base(serviceProvider, logger, ObjectLifetimeScope.Transient)
-			{ }
-
-			public LazyResolver(IServiceProvider serviceProvider, ILogger logger, IEnumerable<Lazy<Type>> values)
+		    public LazyResolver(IServiceProvider serviceProvider, ILogger logger, IEnumerable<Lazy<Type>> values)
 				:base (serviceProvider, logger, values, ObjectLifetimeScope.Transient)
 			{ }
 
diff --git a/src/Umbraco.Tests/Routing/ContentFinderByNiceUrlAndTemplateTests.cs b/src/Umbraco.Tests/Routing/ContentFinderByNiceUrlAndTemplateTests.cs
index e75a8b8e80..6a4cbd1860 100644
--- a/src/Umbraco.Tests/Routing/ContentFinderByNiceUrlAndTemplateTests.cs
+++ b/src/Umbraco.Tests/Routing/ContentFinderByNiceUrlAndTemplateTests.cs
@@ -14,7 +14,7 @@ namespace Umbraco.Tests.Routing
 	{
         Template CreateTemplate(string alias)
         {
-            var template = new Template(alias, alias, alias);
+            var template = new Template(alias, alias);
             template.Content = ""; // else saving throws with a dirty internal error
             ApplicationContext.Services.FileService.SaveTemplate(template);
             return template;
diff --git a/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs b/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
index f7dc8c160c..8faa22ae25 100644
--- a/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
+++ b/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
@@ -62,7 +62,7 @@ namespace Umbraco.Tests.Routing
         {
             var path = "template";
             var name = "Template";
-            var template = new Template(path, name, alias);
+            var template = new Template(name, alias);
             template.Content = ""; // else saving throws with a dirty internal error
             ApplicationContext.Services.FileService.SaveTemplate(template);
             return template;
diff --git a/src/Umbraco.Tests/TreesAndSections/BaseContentTreeTests.cs b/src/Umbraco.Tests/TreesAndSections/BaseContentTreeTests.cs
deleted file mode 100644
index 57a974fc95..0000000000
--- a/src/Umbraco.Tests/TreesAndSections/BaseContentTreeTests.cs
+++ /dev/null
@@ -1,123 +0,0 @@
-using NUnit.Framework;
-using umbraco.cms.presentation.Trees;
-
-namespace Umbraco.Tests.TreesAndSections
-{
-    [TestFixture]
-    public class BaseContentTreeTests 
-    {
-        
-        [TearDown]
-        public void TestTearDown()
-        {
-            BaseTree.AfterTreeRender -= EventHandler;
-            BaseTree.BeforeTreeRender -= EventHandler;
-        }
-
-        [Test]
-        public void Run_Optimized()
-        {
-            var tree1 = new MyOptimizedContentTree1("content");
-            var tree2 = new MyOptimizedContentTree2("content");
-
-            Assert.IsTrue(tree1.UseOptimizedRendering);
-            Assert.IsTrue(tree2.UseOptimizedRendering);
-        }
-
-        [Test]
-        public void Not_Optimized_Events_AfterRender()
-        {
-            var tree = new MyOptimizedContentTree1("content");
-
-            BaseTree.AfterTreeRender += EventHandler;
-
-            Assert.IsFalse(tree.UseOptimizedRendering);
-        }
-
-        [Test]
-        public void Not_Optimized_Events_BeforeRender()
-        {
-            var tree = new MyOptimizedContentTree1("content");
-
-            BaseTree.BeforeTreeRender += EventHandler;
-
-            Assert.IsFalse(tree.UseOptimizedRendering);
-        }
-
-        [Test]
-        public void Not_Optimized_Overriden_Method()
-        {
-            var tree = new MyNotOptimizedContentTree("content");
-
-            Assert.IsFalse(tree.UseOptimizedRendering);
-        }
-
-        private void EventHandler(object sender, TreeEventArgs treeEventArgs)
-        {
-
-        }
-
-        //optimized because we are not overriding OnRenderNode
-        public class MyOptimizedContentTree1 : BaseContentTree
-        {
-            public MyOptimizedContentTree1(string application)
-                : base(application)
-            {
-            }
-
-            protected override void CreateRootNode(ref XmlTreeNode rootNode)
-            {
-
-            }
-        }
-
-        public class MyOptimizedContentTree2 : BaseContentTree
-        {
-            public MyOptimizedContentTree2(string application)
-                : base(application)
-            {
-            }
-
-            protected override bool LoadMinimalDocument
-            {
-                get { return true; }
-            }
-
-            protected override void CreateRootNode(ref XmlTreeNode rootNode)
-            {
-                
-            }
-
-            //even if we override it will still be optimized because of the LoadMinimalDocument flag
-            protected override void OnRenderNode(ref XmlTreeNode xNode, umbraco.cms.businesslogic.web.Document doc)
-            {
-                base.OnRenderNode(ref xNode, doc);
-            }
-        }
-
-        public class MyNotOptimizedContentTree : BaseContentTree
-        {
-            public MyNotOptimizedContentTree(string application)
-                : base(application)
-            {
-            }
-
-            protected override void CreateRootNode(ref XmlTreeNode rootNode)
-            {
-
-            }
-
-            protected override bool LoadMinimalDocument
-            {
-                get { return false; }
-            }
-
-            protected override void OnRenderNode(ref XmlTreeNode xNode, umbraco.cms.businesslogic.web.Document doc)
-            {
-                base.OnRenderNode(ref xNode, doc);
-            }
-        }
-
-        
-    }
-}
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 3b5f70a2b3..361d8b76fd 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -473,7 +473,6 @@
     <Compile Include="TestHelpers\Entities\MockedContentTypes.cs" />
     <Compile Include="TestHelpers\Entities\MockedEntity.cs" />
     <Compile Include="TestHelpers\Entities\MockedMedia.cs" />
-    <Compile Include="TreesAndSections\BaseContentTreeTests.cs" />
     <Compile Include="UmbracoExamine\ContentServiceTest.cs" />
     <Compile Include="UmbracoExamine\EventsTest.cs" />
     <Compile Include="Plugins\TypeHelperTests.cs" />
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 3b1763cf03..99dd58c5fe 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -1286,7 +1286,6 @@
     <Content Include="Umbraco_Client\Panel\Images\panel_boxfooter_statusBar_h2_bg.gif" />
     <Content Include="Umbraco_Client\Panel\Images\panel_boxhead_bg.gif" />
     <Content Include="Umbraco_Client\Panel\Images\panel_boxhead_h2_bg.gif" />
-    <Content Include="Umbraco_Client\Panel\javascript.js" />
     <Content Include="Umbraco_Client\Panel\style.css" />
     <Content Include="Umbraco_Client\ProgressBar\Images\container_left.gif" />
     <Content Include="Umbraco_Client\ProgressBar\Images\container_right.gif" />
diff --git a/src/Umbraco.Web.UI/umbraco/developer/Packages/installedPackage.aspx b/src/Umbraco.Web.UI/umbraco/developer/Packages/installedPackage.aspx
index 44b2991ada..8ae87860d7 100644
--- a/src/Umbraco.Web.UI/umbraco/developer/Packages/installedPackage.aspx
+++ b/src/Umbraco.Web.UI/umbraco/developer/Packages/installedPackage.aspx
@@ -2,7 +2,7 @@
 <%@ Register TagPrefix="cc2" Namespace="umbraco.uicontrols" Assembly="controls" %>
 <asp:Content ContentPlaceHolderID="head" runat="server">
     <script type="text/javascript">
-        function toggleDiv(id, gotoDiv) {
+        function toggleDiv(id) {
             var div = document.getElementById(id);
 
             if (div.style.display == "none")
diff --git a/src/Umbraco.Web.UI/umbraco_client/Dialogs/SortDialog.js b/src/Umbraco.Web.UI/umbraco_client/Dialogs/SortDialog.js
index eb62afd805..671a7f06d7 100644
--- a/src/Umbraco.Web.UI/umbraco_client/Dialogs/SortDialog.js
+++ b/src/Umbraco.Web.UI/umbraco_client/Dialogs/SortDialog.js
@@ -12,11 +12,11 @@
             $.tablesorter.addParser({
                 // use a unique id
                 id: 'cultureDateParser',
-                is: function(s, table, cell) {
+                is: function() {
                     //don't auto-detect this parser
                     return false;
                 },
-                format: function(s, table, cell, cellIndex) {
+                format: function(s, table) {
                     var c = table.config;
 
                     s = s.replace(/\-/g, "/");
diff --git a/src/Umbraco.Web.UI/umbraco_client/Panel/javascript.js b/src/Umbraco.Web.UI/umbraco_client/Panel/javascript.js
deleted file mode 100644
index aca9e28529..0000000000
--- a/src/Umbraco.Web.UI/umbraco_client/Panel/javascript.js
+++ /dev/null
@@ -1,9 +0,0 @@
-//OBSOLETE! THIS IS LEGACY CODE AND WILL BE REMOVED IN FUTURE VERSIONS!
-
-function resizePanel(PanelName, hasMenu, redoOnResize) {
-    //DO NOTHING
-}
-
-function resizePanelTo(PanelName, hasMenu, pWidth, pHeight) {
-    //DO NOTHING
-}
diff --git a/src/Umbraco.Web.UI/umbraco_client/tablesorting/tableDragAndDrop.js b/src/Umbraco.Web.UI/umbraco_client/tablesorting/tableDragAndDrop.js
index 0dc576185a..2b3d1e829b 100644
--- a/src/Umbraco.Web.UI/umbraco_client/tablesorting/tableDragAndDrop.js
+++ b/src/Umbraco.Web.UI/umbraco_client/tablesorting/tableDragAndDrop.js
@@ -326,7 +326,6 @@ jQuery.tableDnD = {
                         return null;
                     }
                 }
-                return row;
             }
         }
         return null;
diff --git a/src/Umbraco.Web/Trees/ContentTreeController.cs b/src/Umbraco.Web/Trees/ContentTreeController.cs
index 9f33a44ea9..4186597034 100644
--- a/src/Umbraco.Web/Trees/ContentTreeController.cs
+++ b/src/Umbraco.Web/Trees/ContentTreeController.cs
@@ -31,7 +31,6 @@ namespace Umbraco.Web.Trees
         Constants.Applications.Settings,
         Constants.Applications.Developer,
         Constants.Applications.Members)]
-    [LegacyBaseTree(typeof(loadContent))]
     [Tree(Constants.Applications.Content, Constants.Trees.Content)]
     [PluginController("UmbracoTrees")]
     [CoreTree]
diff --git a/src/Umbraco.Web/Trees/ContentTypeTreeController.cs b/src/Umbraco.Web/Trees/ContentTypeTreeController.cs
index 43cf60a178..b1fb00bb3d 100644
--- a/src/Umbraco.Web/Trees/ContentTypeTreeController.cs
+++ b/src/Umbraco.Web/Trees/ContentTypeTreeController.cs
@@ -19,7 +19,6 @@ namespace Umbraco.Web.Trees
     [Tree(Constants.Applications.Settings, Constants.Trees.DocumentTypes, null, sortOrder: 6)]
     [Mvc.PluginController("UmbracoTrees")]
     [CoreTree]
-    [LegacyBaseTree(typeof(loadNodeTypes))]
     public class ContentTypeTreeController : TreeController
     {
         protected override TreeNodeCollection GetTreeNodes(string id, FormDataCollection queryStrings)
diff --git a/src/Umbraco.Web/Trees/LegacyBaseTreeAttribute.cs b/src/Umbraco.Web/Trees/LegacyBaseTreeAttribute.cs
index fcb858e0ad..fdac14dd1a 100644
--- a/src/Umbraco.Web/Trees/LegacyBaseTreeAttribute.cs
+++ b/src/Umbraco.Web/Trees/LegacyBaseTreeAttribute.cs
@@ -12,6 +12,7 @@ namespace Umbraco.Web.Trees
     /// on the new tree which legacy tree to load (it won't actually render using the new tree)
     /// </remarks>
     [AttributeUsage(AttributeTargets.Class)]
+    [Obsolete("Remove this in v8, it should no longer be necessary!")]
     internal sealed class LegacyBaseTreeAttribute : Attribute
     {
         public Type BaseTreeType { get; private set; }
diff --git a/src/Umbraco.Web/Trees/MediaTypeTreeController.cs b/src/Umbraco.Web/Trees/MediaTypeTreeController.cs
index a7da33898d..98208f8530 100644
--- a/src/Umbraco.Web/Trees/MediaTypeTreeController.cs
+++ b/src/Umbraco.Web/Trees/MediaTypeTreeController.cs
@@ -19,7 +19,6 @@ namespace Umbraco.Web.Trees
     [Tree(Constants.Applications.Settings, Constants.Trees.MediaTypes, null, sortOrder:5)]
     [Mvc.PluginController("UmbracoTrees")]
     [CoreTree]
-    [LegacyBaseTree(typeof(loadMediaTypes))]
     public class MediaTypeTreeController : TreeController
     {
         protected override TreeNodeCollection GetTreeNodes(string id, FormDataCollection queryStrings)
diff --git a/src/Umbraco.Web/Trees/MemberTypeTreeController.cs b/src/Umbraco.Web/Trees/MemberTypeTreeController.cs
index d739c2a661..060d43f237 100644
--- a/src/Umbraco.Web/Trees/MemberTypeTreeController.cs
+++ b/src/Umbraco.Web/Trees/MemberTypeTreeController.cs
@@ -16,7 +16,6 @@ namespace Umbraco.Web.Trees
     [Tree(Constants.Applications.Members, Constants.Trees.MemberTypes, null, sortOrder:2  )]
     [Mvc.PluginController("UmbracoTrees")]
     [CoreTree]
-    [LegacyBaseTree(typeof(loadMemberTypes))]
     public class MemberTypeTreeController : TreeController
     {
         protected override TreeNodeCollection GetTreeNodes(string id, FormDataCollection queryStrings)
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 0d1daebfdb..0f0f5c1a1a 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -1536,18 +1536,12 @@
     <Compile Include="umbraco.presentation\umbraco\treeInit.aspx.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
-    <Compile Include="umbraco.presentation\umbraco\Trees\BaseContentTree.cs" />
     <Compile Include="umbraco.presentation\umbraco\Trees\BaseTree.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\ContentRecycleBin.cs" />
     <Compile Include="umbraco.presentation\umbraco\Trees\FileSystemTree.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadContent.cs" />
     <Compile Include="umbraco.presentation\umbraco\Trees\loadDictionary.cs" />
     <Compile Include="umbraco.presentation\umbraco\Trees\loadLanguages.cs" />
     <Compile Include="umbraco.presentation\umbraco\Trees\loadMacros.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadMediaTypes.cs" />
     <Compile Include="umbraco.presentation\umbraco\Trees\loadMemberGroups.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadMemberTypes.cs" />
-    <Compile Include="umbraco.presentation\umbraco\Trees\loadNodeTypes.cs" />
     <Compile Include="umbraco.presentation\umbraco\Trees\loadPackages.cs" />
     <Compile Include="umbraco.presentation\umbraco\Trees\loadScripts.cs" />
     <Compile Include="umbraco.presentation\umbraco\Trees\loadStylesheetProperty.cs" />
diff --git a/src/Umbraco.Web/umbraco.presentation/content.cs b/src/Umbraco.Web/umbraco.presentation/content.cs
index 3407482b91..6fa1e0fcea 100644
--- a/src/Umbraco.Web/umbraco.presentation/content.cs
+++ b/src/Umbraco.Web/umbraco.presentation/content.cs
@@ -608,11 +608,6 @@ order by umbracoNode.level, umbracoNode.sortOrder";
             }
         }
 
-        [Obsolete("This method should not be used and does nothing, xml file persistence is done in a queue using a BackgroundTaskRunner")]
-        public void PersistXmlToFile()
-        {
-        }
-
         /// <summary>
         /// Adds a task to the xml cache file persister
         /// </summary>
@@ -677,17 +672,6 @@ order by umbracoNode.level, umbracoNode.sortOrder";
         */
 
         // ensures config is valid
-        private void EnsureConfigurationIsValid()
-        {
-            if (SyncToXmlFile && SyncFromXmlFile)
-                throw new Exception("Cannot run with both ContinouslyUpdateXmlDiskCache and XmlContentCheckForDiskChanges being true.");
-
-            if (XmlIsImmutable == false)
-                //LogHelper.Warn<XmlStore>("Running with CloneXmlContent being false is a bad idea.");
-                LogHelper.Warn<content>("CloneXmlContent is false - ignored, we always clone.");
-
-            // note: if SyncFromXmlFile then we should also disable / warn that local edits are going to cause issues...
-        }
 
         #endregion
 
@@ -818,13 +802,6 @@ order by umbracoNode.level, umbracoNode.sortOrder";
             return SafeXmlReaderWriter.GetReader(this, releaser);
         }
 
-        // gets a locked safe read accses to the main xml
-        private async Task<SafeXmlReaderWriter> GetSafeXmlReaderAsync()
-        {
-            var releaser = await _xmlLock.LockAsync();
-            return SafeXmlReaderWriter.GetReader(this, releaser);
-        }
-
         // gets a locked safe write access to the main xml (cloned)
         private SafeXmlReaderWriter GetSafeXmlWriter(bool auto = true)
         {
diff --git a/src/Umbraco.Web/umbraco.presentation/macro.cs b/src/Umbraco.Web/umbraco.presentation/macro.cs
index 0214f43158..c24455fa33 100644
--- a/src/Umbraco.Web/umbraco.presentation/macro.cs
+++ b/src/Umbraco.Web/umbraco.presentation/macro.cs
@@ -27,7 +27,6 @@ using Umbraco.Core.Models;
 using Umbraco.Core.Services;
 using Umbraco.Core.Xml.XPath;
 using Umbraco.Core.Profiling;
-using umbraco.interfaces;
 using Umbraco.Web;
 using Umbraco.Web.Cache;
 using Umbraco.Web.Macros;
@@ -1638,27 +1637,6 @@ namespace umbraco
             return xslt;
         }
 
-        private static INode GetCurrentNode()
-        {
-            //Get the current content request
-
-            IPublishedContent content;
-            if (UmbracoContext.Current.IsFrontEndUmbracoRequest)
-            {
-                content = UmbracoContext.Current.PublishedContentRequest != null
-                    ? UmbracoContext.Current.PublishedContentRequest.PublishedContent
-                    : null;
-            }
-            else
-            {
-                var pageId = UmbracoContext.Current.PageId;
-                content = pageId.HasValue ? UmbracoContext.Current.ContentCache.GetById(pageId.Value) : null;
-            }
-
-            return content == null ? null : LegacyNodeHelper.ConvertToNode(content);
-        }
-
-
         #region Events
 
         /// <summary>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseContentTree.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseContentTree.cs
deleted file mode 100644
index 1eacc072bd..0000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseContentTree.cs
+++ /dev/null
@@ -1,513 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Web;
-using Umbraco.Core;
-using Umbraco.Core.Models;
-using umbraco.BasePages;
-using umbraco.BusinessLogic;
-using umbraco.cms.businesslogic.web;
-using umbraco.interfaces;
-using umbraco.BusinessLogic.Actions;
-
-
-namespace umbraco.cms.presentation.Trees
-{
-    /// <summary>
-    /// An abstract tree class for the content application.
-    /// Has built in methods for handling all of the request parameters specific to the content tree.
-    /// </summary>
-    [Obsolete("This is no longer used and will be removed from the codebase in the future")]
-    public abstract class BaseContentTree : BaseTree
-    {
-
-        public BaseContentTree(string application) : base(application) { }
-
-        private User _user;
-        
-        protected virtual bool LoadMinimalDocument { get; set; }
-
-        /// <summary>
-        /// Returns the current User. This ensures that we don't instantiate a new User object 
-        /// each time.
-        /// </summary>
-        protected User CurrentUser
-        {
-            get
-            {
-                return (_user == null ? (_user = UmbracoEnsuredPage.CurrentUser) : _user);
-            }
-        }
-
-        /// <summary>
-        /// Renders the Javascript.
-        /// </summary>
-        /// <param name="Javascript">The javascript.</param>
-        public override void RenderJS(ref StringBuilder Javascript)
-        {
-            if (!String.IsNullOrEmpty(this.FunctionToCall))
-            {
-                Javascript.Append("function openContent(id) {\n");
-                Javascript.Append(this.FunctionToCall + "(id);\n");
-                Javascript.Append("}\n");
-            }
-            else if (!this.IsDialog)
-            {
-                Javascript.Append(
-					@"
-function openContent(id) {
-	UmbClientMgr.contentFrame('editContent.aspx?id=' + id);
-}
-");
-            }
-        }
-
-        /// <summary>
-        /// Renders the specified tree item.
-        /// </summary>        
-        /// <param name="Tree">The tree.</param>
-        public override void Render(ref XmlTree Tree)
-        {
-            if (UseOptimizedRendering == false)
-            {
-                //We cannot run optimized mode since there are subscribers to events/methods that require document instances
-                // so we'll render the original way by looking up the docs.
-
-                //get documents to render
-                var docs = Document.GetChildrenForTree(m_id);
-
-                var args = new TreeEventArgs(Tree);
-                OnBeforeTreeRender(docs, args);
-
-                foreach (var dd in docs)
-                {
-                    var allowedUserOptions = GetUserActionsForNode(dd);
-                    if (CanUserAccessNode(dd, allowedUserOptions))
-                    {
-
-                        var node = CreateNode(dd, allowedUserOptions);
-
-                        OnRenderNode(ref node, dd);
-
-                        OnBeforeNodeRender(ref Tree, ref node, EventArgs.Empty);
-                        if (node != null)
-                        {
-                            Tree.Add(node);
-                            OnAfterNodeRender(ref Tree, ref node, EventArgs.Empty);
-                        }
-                    }
-                }
-                OnAfterTreeRender(docs, args);
-            }
-            else
-            {
-
-                //We ARE running in optmized mode, this means we will NOT be raising the BeforeTreeRender or AfterTreeRender 
-                // events and NOT calling the OnRenderNode method - we've already detected that there are not subscribers or implementations
-                // to call so that is fine.
-
-                var entities = Services.EntityService.GetChildren(m_id, UmbracoObjectTypes.Document).ToArray();
-                foreach (var entity in entities)
-                {
-                    var e = entity as UmbracoEntity;
-                    var allowedUserOptions = GetUserActionsForNode(e);
-                    if (CanUserAccessNode(e, allowedUserOptions))
-                    {
-                        var node = CreateNode(e, allowedUserOptions);
-
-                        //in optimized mode the LoadMinimalDocument will ALWAYS be true, if it is not true then we will
-                        // be rendering in non-optimized mode and this code will not get executed so we don't need to worry
-                        // about performance here.
-                        OnRenderNode(ref node, new Document(e, LoadMinimalDocument));
-                        
-                        OnBeforeNodeRender(ref Tree, ref node, EventArgs.Empty);
-                        if (node != null)
-                        {
-                            Tree.Add(node);
-                            OnAfterNodeRender(ref Tree, ref node, EventArgs.Empty);
-                        }
-                    }
-                }
-            }
-        }
-
-        #region Tree Create-node-helper Methods - Legacy
-        /// <summary>
-        /// Creates an XmlTreeNode based on the passed in Document
-        /// </summary>
-        /// <param name="dd"></param>
-        /// <param name="allowedUserOptions"></param>
-        /// <returns></returns>
-        protected XmlTreeNode CreateNode(Document dd, List<IAction> allowedUserOptions)
-        {
-            XmlTreeNode node = XmlTreeNode.Create(this);
-            SetMenuAttribute(ref node, allowedUserOptions);
-            node.NodeID = dd.Id.ToString();
-            node.Text = dd.Text;
-            SetNonPublishedAttribute(ref node, dd);
-            SetProtectedAttribute(ref node, dd);
-            SetActionAttribute(ref node, dd);
-            SetSourcesAttributes(ref node, dd);
-            if (dd.ContentTypeIcon != null)
-            {
-                node.Icon = dd.ContentTypeIcon;
-                node.OpenIcon = dd.ContentTypeIcon;
-            }
-
-            if (dd.HasPublishedVersion() == false)
-                node.Style.DimNode();
-
-            if (dd.HasPendingChanges())
-                node.Style.HighlightNode();
-
-            return node;
-        }
-        
-        /// <summary>
-        /// Creates the link for the current document 
-        /// </summary>
-        /// <param name="dd"></param>
-        /// <returns></returns>
-        protected string CreateNodeLink(Document dd)
-        {
-            string nodeLink = library.NiceUrl(dd.Id);
-            if (nodeLink == "")
-            {
-                nodeLink = "/" + dd.Id;
-                if (GlobalSettings.UseDirectoryUrls == false)
-                    nodeLink += ".aspx";
-            }
-            return nodeLink;
-        }
-
-        /// <summary>
-        /// Inheritors override this method to modify the content node being created
-        /// </summary>
-        /// <param name="xNode"></param>
-        /// <param name="doc"></param>
-        protected virtual void OnRenderNode(ref XmlTreeNode xNode, Document doc) { }
-
-        /// <summary>
-        /// Determins if the user has access to view the node/document
-        /// </summary>
-        /// <param name="doc">The Document to check permissions against</param>
-        /// <param name="allowedUserOptions">A list of IActions that the user has permissions to execute on the current document</param>
-        /// <remarks>By default the user must have Browse permissions to see the node in the Content tree</remarks>
-        /// <returns></returns>        
-        protected virtual bool CanUserAccessNode(Document doc, List<IAction> allowedUserOptions)
-        {
-            if (allowedUserOptions.Contains(ActionBrowse.Instance))
-                return true;
-
-            return false;
-        }
-
-        /// <summary>
-        /// Builds a string of actions that the user is able to perform on the current document.
-        /// The list of actions is subject to the user's rights assigned to the document and also
-        /// is dependant on the type of node.
-        /// </summary>
-        /// <param name="dd"></param>
-        /// <returns></returns>
-        protected List<IAction> GetUserActionsForNode(Document dd)
-        {
-            List<IAction> actions = umbraco.BusinessLogic.Actions.Action.FromString(CurrentUser.GetPermissions(dd.Path));
-
-            // A user is allowed to delete their own stuff
-            if (dd.UserId == CurrentUser.Id && actions.Contains(ActionDelete.Instance) == false)
-                actions.Add(ActionDelete.Instance);
-
-            return actions;
-        }
-
-        #endregion
-
-        #region Tree Create-node-helper Methods - UmbracoEntity equivalent
-        /// <summary>
-        /// Creates an XmlTreeNode based on the passed in UmbracoEntity
-        /// </summary>
-        /// <param name="dd"></param>
-        /// <param name="allowedUserOptions"></param>
-        /// <returns></returns>
-        internal XmlTreeNode CreateNode(UmbracoEntity dd, List<IAction> allowedUserOptions)
-        {
-            XmlTreeNode node = XmlTreeNode.Create(this);
-            SetMenuAttribute(ref node, allowedUserOptions);
-            node.NodeID = dd.Id.ToString();
-            node.Text = dd.Name;
-            SetNonPublishedAttribute(ref node, dd);
-            SetProtectedAttribute(ref node, dd);
-            SetActionAttribute(ref node, dd);
-            SetSourcesAttributes(ref node, dd);
-            if (dd.ContentTypeIcon != null)
-            {
-                node.Icon = dd.ContentTypeIcon;
-                node.OpenIcon = dd.ContentTypeIcon;
-            }
-
-            if (dd.IsPublished == false)
-                node.Style.DimNode();
-
-            if (dd.HasPendingChanges)
-                node.Style.HighlightNode();
-
-            return node;
-        }
-
-        /// <summary>
-        /// Creates the link for the current UmbracoEntity 
-        /// </summary>
-        /// <param name="dd"></param>
-        /// <returns></returns>
-        internal string CreateNodeLink(UmbracoEntity dd)
-        {
-            string nodeLink = library.NiceUrl(dd.Id);
-            if (nodeLink == "")
-            {
-                nodeLink = "/" + dd.Id;
-                if (GlobalSettings.UseDirectoryUrls == false)
-                    nodeLink += ".aspx";
-            }
-            return nodeLink;
-        }
-
-        /// <summary>
-        /// Determins if the user has access to view the node/document
-        /// </summary>
-        /// <param name="doc">The Document to check permissions against</param>
-        /// <param name="allowedUserOptions">A list of IActions that the user has permissions to execute on the current document</param>
-        /// <remarks>By default the user must have Browse permissions to see the node in the Content tree</remarks>
-        /// <returns></returns>        
-        internal virtual bool CanUserAccessNode(UmbracoEntity doc, List<IAction> allowedUserOptions)
-        {
-            if (allowedUserOptions.Contains(ActionBrowse.Instance))
-                return true;
-
-            return false;
-        }
-
-        /// <summary>
-        /// Builds a string of actions that the user is able to perform on the current document.
-        /// The list of actions is subject to the user's rights assigned to the document and also
-        /// is dependant on the type of node.
-        /// </summary>
-        /// <param name="dd"></param>
-        /// <returns></returns>
-        internal List<IAction> GetUserActionsForNode(UmbracoEntity dd)
-        {
-            List<IAction> actions = umbraco.BusinessLogic.Actions.Action.FromString(CurrentUser.GetPermissions(dd.Path));
-
-            // A user is allowed to delete their own stuff
-            if (dd.CreatorId == CurrentUser.Id && actions.Contains(ActionDelete.Instance) == false)
-                actions.Add(ActionDelete.Instance);
-
-            return actions;
-        }
-        #endregion
-
-        #region Tree Attribute Setter Methods - Legacy
-
-        protected void SetNonPublishedAttribute(ref XmlTreeNode treeElement, Document dd)
-        {
-            treeElement.NotPublished = false;
-            if (dd.Published)
-            {
-                //if (Math.Round(new TimeSpan(dd.UpdateDate.Ticks - dd.VersionDate.Ticks).TotalSeconds, 0) > 1)
-                //    treeElement.NotPublished = true;
-                treeElement.NotPublished = dd.HasPendingChanges();
-            }
-            else
-                treeElement.NotPublished = true;
-        }
-        
-        protected void SetProtectedAttribute(ref XmlTreeNode treeElement, Document dd)
-        {
-            if (Access.IsProtected(dd.Id, dd.Path))
-                treeElement.IsProtected = true;
-            else
-                treeElement.IsProtected = false;
-        }
-        
-        protected void SetActionAttribute(ref XmlTreeNode treeElement, Document dd)
-        {
-            
-            // Check for dialog behaviour
-            if (this.DialogMode == TreeDialogModes.fulllink )
-            {
-                string nodeLink = CreateNodeLink(dd);
-                treeElement.Action = String.Format("javascript:openContent('{0}');", nodeLink);
-            }
-            else if (this.DialogMode == TreeDialogModes.locallink)
-            {
-                string nodeLink = string.Format("{{localLink:{0}}}", dd.Id);
-                string nodeText = dd.Text.Replace("'", "\\'");
-                // try to make a niceurl too
-                string niceUrl = umbraco.library.NiceUrl(dd.Id).Replace("'", "\\'"); ;
-                if (niceUrl != "#" || niceUrl != "") {
-                    nodeLink += "|" + niceUrl + "|" + HttpContext.Current.Server.HtmlEncode(nodeText);
-                } else {
-                    nodeLink += "||" + HttpContext.Current.Server.HtmlEncode(nodeText);
-                }
-                
-                treeElement.Action = String.Format("javascript:openContent('{0}');", nodeLink);
-            }
-            else if (this.DialogMode == TreeDialogModes.id || this.DialogMode == TreeDialogModes.none)
-            {
-                treeElement.Action = String.Format("javascript:openContent('{0}');", dd.Id.ToString());
-            }
-            else if (!this.IsDialog || (this.DialogMode == TreeDialogModes.id))
-            {
-                if (CurrentUser.GetPermissions(dd.Path).Contains(ActionUpdate.Instance.Letter.ToString()))
-                {
-                    treeElement.Action = String.Format("javascript:openContent({0});", dd.Id);
-                }
-            }
-        }
-        
-        protected void SetSourcesAttributes(ref XmlTreeNode treeElement, Document dd)
-        {
-            treeElement.HasChildren = dd.ContentType.IsContainerContentType == false && dd.HasChildren;
-            treeElement.Source = IsDialog == false ? GetTreeServiceUrl(dd.Id) : GetTreeDialogUrl(dd.Id);
-        }
-
-        protected void SetMenuAttribute(ref XmlTreeNode treeElement, List<IAction> allowedUserActions)
-        {
-            //clear menu if we're to hide it
-            treeElement.Menu = this.ShowContextMenu == false ? null : RemoveDuplicateMenuDividers(GetUserAllowedActions(AllowedActions, allowedUserActions));
-        }
-
-        #endregion
-
-        #region Tree Attribute Setter Methods - UmbracoEntity equivalent
-
-        internal void SetNonPublishedAttribute(ref XmlTreeNode treeElement, UmbracoEntity dd)
-        {
-            treeElement.NotPublished = false;
-            if (dd.IsPublished)
-                treeElement.NotPublished = dd.HasPendingChanges;
-            else
-                treeElement.NotPublished = true;
-        }
-
-        internal void SetProtectedAttribute(ref XmlTreeNode treeElement, UmbracoEntity dd)
-        {
-            if (Access.IsProtected(dd.Id, dd.Path))
-                treeElement.IsProtected = true;
-            else
-                treeElement.IsProtected = false;
-        }
-
-        internal void SetActionAttribute(ref XmlTreeNode treeElement, UmbracoEntity dd)
-        {
-
-            // Check for dialog behaviour
-            if (this.DialogMode == TreeDialogModes.fulllink)
-            {
-                string nodeLink = CreateNodeLink(dd);
-                treeElement.Action = String.Format("javascript:openContent('{0}');", nodeLink);
-            }
-            else if (this.DialogMode == TreeDialogModes.locallink)
-            {
-                string nodeLink = string.Format("{{localLink:{0}}}", dd.Id);
-                string nodeText = dd.Name.Replace("'", "\\'");
-                // try to make a niceurl too
-                string niceUrl = umbraco.library.NiceUrl(dd.Id).Replace("'", "\\'"); ;
-                if (niceUrl != "#" || niceUrl != "")
-                {
-                    nodeLink += "|" + niceUrl + "|" + HttpContext.Current.Server.HtmlEncode(nodeText);
-                }
-                else
-                {
-                    nodeLink += "||" + HttpContext.Current.Server.HtmlEncode(nodeText);
-                }
-
-                treeElement.Action = String.Format("javascript:openContent('{0}');", nodeLink);
-            }
-            else if (this.DialogMode == TreeDialogModes.id || this.DialogMode == TreeDialogModes.none)
-            {
-                treeElement.Action = String.Format("javascript:openContent('{0}');", dd.Id.ToString(CultureInfo.InvariantCulture));
-            }
-            else if (this.IsDialog == false || (this.DialogMode == TreeDialogModes.id))
-            {
-                if (CurrentUser.GetPermissions(dd.Path).Contains(ActionUpdate.Instance.Letter.ToString(CultureInfo.InvariantCulture)))
-                {
-                    treeElement.Action = String.Format("javascript:openContent({0});", dd.Id);
-                }
-            }
-        }
-
-        internal void SetSourcesAttributes(ref XmlTreeNode treeElement, UmbracoEntity dd)
-        {
-            treeElement.HasChildren = dd.HasChildren;
-            treeElement.Source = IsDialog == false ? GetTreeServiceUrl(dd.Id) : GetTreeDialogUrl(dd.Id);
-        }
-
-        #endregion
-
-        /// <summary>
-        /// The returned list is filtered based on the IActions that the user is allowed to perform based on the actions
-        /// that are allowed for the current tree.
-        /// </summary>
-        /// <param name="actions"></param>
-        /// <param name="userAllowedActions"></param>
-        /// <returns></returns>
-        protected List<IAction> GetUserAllowedActions(List<IAction> actions, List<IAction> userAllowedActions)
-        {
-            return actions.FindAll(
-                delegate(IAction a)
-                {
-                    return (!a.CanBePermissionAssigned || (a.CanBePermissionAssigned && userAllowedActions.Contains(a)));
-                }
-            );
-
-        }
-
-        /// <summary>
-        /// Once the context menu has been created, this utility will simply strip out duplicate dividers if they exist and also leading and trailing dividers.
-        /// </summary>
-        /// <param name="actions"></param>
-        /// <returns></returns>
-        protected List<IAction> RemoveDuplicateMenuDividers(List<IAction> actions)
-        {
-            string fullMenu = umbraco.BusinessLogic.Actions.Action.ToString(actions);
-            while (fullMenu.IndexOf(",,") > 0) //remove all occurances of duplicate dividers
-                fullMenu = fullMenu.Replace(",,", ",");
-            fullMenu = fullMenu.Trim(new char[] { ',' }); //remove any ending dividers
-            return umbraco.BusinessLogic.Actions.Action.FromString(fullMenu);
-        }
-
-        /// <summary>
-        /// Returns true if we can use the EntityService to render the tree or revert to the original way 
-        /// using normal documents
-        /// </summary>
-        /// <remarks>
-        /// We determine this by:
-        /// * If there are any subscribers to the events: BeforeTreeRender or AfterTreeRender - then we cannot run optimized
-        /// * If there are any overrides of the method: OnRenderNode - then we cannot run optimized
-        /// </remarks>
-        internal bool UseOptimizedRendering
-        {
-            get
-            {
-                if (HasEntityBasedEventSubscribers)
-                {
-                    return false;
-                }
-
-                //now we need to check if the current tree type has OnRenderNode overridden with a custom implementation
-                //Strangely - this even works in med trust!
-                var method = this.GetType().GetMethod("OnRenderNode", BindingFlags.Instance | BindingFlags.NonPublic, null, new[] { typeof(XmlTreeNode).MakeByRefType(), typeof(Document) }, null);
-                if (TypeHelper.IsOverride(method) && LoadMinimalDocument == false)
-                {
-                    return false;
-                }
-
-                return true;
-            }
-        }
-
-    }
-}
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/ContentRecycleBin.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/ContentRecycleBin.cs
deleted file mode 100644
index 06f450abd1..0000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/ContentRecycleBin.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using umbraco.businesslogic;
-using umbraco.cms.businesslogic;
-using umbraco.cms.businesslogic.web;
-using umbraco.interfaces;
-using umbraco.BusinessLogic.Actions;
-using Umbraco.Core;
-
-
-namespace umbraco.cms.presentation.Trees
-{
-    /// <summary>
-    /// Handles loading the content tree into umbraco's application tree
-    /// </summary>
-    [Obsolete("This is no longer used and will be removed from the codebase in the future")]
-    public class ContentRecycleBin : BaseContentTree
-    {
-
-        public ContentRecycleBin(string application) : base(application) { }
-
-        protected override bool LoadMinimalDocument
-        {
-            get
-            {
-                return true;
-            }
-        }
-
-        protected override void CreateRootNodeActions(ref List<IAction> actions)
-		{
-			actions.Clear();
-            actions.Add(ActionEmptyTranscan.Instance);
-			actions.Add(ContextMenuSeperator.Instance);
-			actions.Add(ActionRefresh.Instance);
-		}
-
-        protected override void CreateAllowedActions(ref List<IAction> actions)
-		{
-            actions.Clear();
-            actions.Add(ActionMove.Instance);
-            actions.Add(ContextMenuSeperator.Instance);
-            actions.Add(ActionDelete.Instance);
-            actions.Add(ContextMenuSeperator.Instance);
-            actions.Add(ActionRefresh.Instance);
-		}
-
-        protected override void CreateRootNode(ref XmlTreeNode rootNode)
-        {
-            rootNode.Icon = "bin_empty.png";
-			rootNode.OpenIcon = "bin.png";
-			//we made this alias the same as content, so the node name would be media,
-			//we need to make it recycle bin
-			TreeDefinition treeDef = TreeDefinitionCollection.Instance.FindTree(this);
-			rootNode.Text = rootNode.Text = GetTreeHeader(treeDef.Tree.Alias);
-
-            if (new RecycleBin(RecycleBin.RecycleBinType.Content).Smells())
-			{
-				rootNode.Icon = "bin.png";
-			}				
-            else
-                rootNode.Source = null;
-        }
-      
-
-        /// <summary>
-        /// By default the Recycle bin start node is -20
-        /// </summary>
-		public override int StartNodeID
-		{
-			get
-			{
-                return (int)RecycleBin.RecycleBinType.Content;
-			}
-		}
-
-        /// <summary>
-        /// Override the render js so no duplicate js is rendered.
-        /// </summary>
-        /// <param name="Javascript"></param>
-        public override void RenderJS(ref StringBuilder Javascript) { }
-      
-        protected override void OnRenderNode(ref XmlTreeNode xNode, Document doc)
-        {
-			xNode.Style.DimNode();
-        }
-
-    }
-}
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadContent.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadContent.cs
deleted file mode 100644
index 49251f2ebd..0000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadContent.cs
+++ /dev/null
@@ -1,218 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Umbraco.Core.Configuration;
-using umbraco.BusinessLogic.Actions;
-using umbraco.businesslogic;
-using umbraco.cms.businesslogic.web;
-using umbraco.cms.presentation.Trees;
-using umbraco.interfaces;
-using Umbraco.Core;
-using Action = umbraco.BusinessLogic.Actions.Action;
-
-namespace umbraco
-{
-    /// <summary>
-    /// Handles loading the content tree into umbraco's application tree
-    /// </summary>
-    [Obsolete("This is no longer used and will be removed from the codebase in the future")]
-    //[Tree(Constants.Applications.Content, "content", "Content", silent: true)]
-    public class loadContent : BaseContentTree
-    {
-
-        public loadContent(string application)
-            : base(application)
-        {
-            this._StartNodeID = CurrentUser.StartNodeId;
-        }
-
-        private Document m_document;
-        private int _StartNodeID;
-
-        /// <summary>
-        /// Returns the Document object of the starting node for the current User. This ensures
-        /// that the Document object is only instantiated once.
-        /// </summary>
-        protected Document StartNode
-        {
-            get
-            {
-                if (m_document == null)
-                {
-                    m_document = new Document(StartNodeID);
-                }
-
-                if (!m_document.Path.Contains(CurrentUser.StartNodeId.ToString()))
-                {
-                    var doc = new Document(CurrentUser.StartNodeId);
-                    if (!string.IsNullOrEmpty(doc.Path) && doc.Path.Contains(this.StartNodeID.ToString()))
-                    {
-                        m_document = doc;
-                    }
-                    else
-                    {
-                        return null;
-                    }
-                }
-
-                return m_document;
-            }
-        }
-
-        protected override bool LoadMinimalDocument
-        {
-            get
-            {
-                return true;
-            }
-        }
-
-        /// <summary>
-        /// Creates the root node context menu for the content tree.
-        /// Depending on the current User's permissions, this menu will change.
-        /// If the current User's starting node is not -1 (the normal root content tree node)
-        /// then the menu will be built based on the permissions of the User's start node.
-        /// </summary>
-        /// <param name="actions"></param>
-        protected override void CreateRootNodeActions(ref List<IAction> actions)
-        {
-            actions.Clear();
-
-            if (StartNodeID != -1)
-            {
-                //get the document for the start node id
-                Document doc = StartNode;
-                if (doc == null)
-                {
-                    return;
-                }
-                //get the allowed actions for the user for the current node
-                List<IAction> nodeActions = GetUserActionsForNode(doc);
-                //get the allowed actions for the tree based on the users allowed actions
-                List<IAction> allowedMenu = GetUserAllowedActions(AllowedActions, nodeActions);
-                actions.AddRange(allowedMenu);
-            }
-            else
-            {
-                // we need to get the default permissions as you can't set permissions on the very root node
-                List<IAction> nodeActions = Action.FromString(CurrentUser.GetPermissions("-1"));
-                List<IAction> allowedRootActions = new List<IAction>();
-                allowedRootActions.Add(ActionNew.Instance);
-                allowedRootActions.Add(ActionSort.Instance);
-                List<IAction> allowedMenu = GetUserAllowedActions(allowedRootActions, nodeActions);
-                actions.AddRange(allowedMenu);
-                if (allowedMenu.Count > 0)
-                    actions.Add(ContextMenuSeperator.Instance);
-
-                // default actions for all users
-                actions.Add(ActionRePublish.Instance);
-                actions.Add(ContextMenuSeperator.Instance);
-                actions.Add(ActionRefresh.Instance);
-                //actions.Add(ActionTreeEditMode.Instance);
-            }
-        }
-
-        protected override void CreateAllowedActions(ref List<IAction> actions)
-        {
-            actions.Clear();
-            actions.Add(ActionNew.Instance);
-            actions.Add(ContextMenuSeperator.Instance);
-            actions.Add(ActionDelete.Instance);
-            actions.Add(ContextMenuSeperator.Instance);
-            actions.Add(ActionMove.Instance);
-            actions.Add(ActionCopy.Instance);
-            actions.Add(ContextMenuSeperator.Instance);
-            actions.Add(ActionSort.Instance);
-            actions.Add(ActionRollback.Instance);
-            actions.Add(ContextMenuSeperator.Instance);
-            actions.Add(ActionChangeDocType.Instance);
-            actions.Add(ContextMenuSeperator.Instance);
-            actions.Add(ActionPublish.Instance);
-            actions.Add(ActionToPublish.Instance);
-            actions.Add(ActionAssignDomain.Instance);
-            actions.Add(ActionRights.Instance);
-            actions.Add(ContextMenuSeperator.Instance);
-            actions.Add(ActionProtect.Instance);
-            actions.Add(ContextMenuSeperator.Instance);
-            actions.Add(ActionUnPublish.Instance);
-            actions.Add(ContextMenuSeperator.Instance);
-            actions.Add(ActionNotify.Instance);
-            actions.Add(ActionSendToTranslate.Instance);
-            actions.Add(ContextMenuSeperator.Instance);
-            actions.Add(ActionRefresh.Instance);
-        }
-
-        /// <summary>
-        /// Creates the root node for the content tree. If the current User does
-        /// not have access to the actual content tree root, then we'll display the 
-        /// node that correlates to their StartNodeID
-        /// </summary>
-        /// <param name="rootNode"></param>
-        protected override void CreateRootNode(ref XmlTreeNode rootNode)
-        {
-            if (StartNodeID != -1)
-            {
-                Document doc = StartNode;
-                if (doc == null)
-                {
-                    rootNode = new NullTree(this.app).RootNode;
-                    rootNode.Text = "You do not have permission for this content tree";
-                    rootNode.HasChildren = false;
-                    rootNode.Source = string.Empty;
-                }
-                else
-                {
-                    rootNode = CreateNode(doc, RootNodeActions);
-                }
-            }
-            else
-            {
-                if (IsDialog)
-                    rootNode.Action = "javascript:openContent(-1);";
-            }
-
-        }
-
-        /// <summary>
-        /// If the user is an admin, always return entire tree structure, otherwise
-        /// return the user's start node id.
-        /// </summary>
-        public override int StartNodeID
-        {
-            get
-            {
-                return this._StartNodeID;
-            }
-        }
-
-        /// <summary>
-        /// Adds the recycling bin node. This method should only actually add the recycle bin node when the tree is initially created and if the user
-        /// actually has access to the root node.
-        /// </summary>
-        /// <returns></returns>
-        protected XmlTreeNode CreateRecycleBin()
-        {
-            if (m_id == -1 && !this.IsDialog)
-            {
-                //create a new content recycle bin tree, initialized with it's startnodeid
-                ContentRecycleBin bin = new ContentRecycleBin(this.m_app);
-                bin.ShowContextMenu = this.ShowContextMenu;
-                bin.id = bin.StartNodeID;
-                return bin.RootNode;
-            }
-            return null;
-        }
-
-
-        /// <summary>
-        /// Override the render method to add the recycle bin to the end of this tree
-        /// </summary>
-        /// <param name="Tree"></param>
-        public override void Render(ref XmlTree tree)
-        {
-            base.Render(ref tree);
-            XmlTreeNode recycleBin = CreateRecycleBin();
-            if (recycleBin != null)
-                tree.Add(recycleBin);
-        }
-    }
-}
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMediaTypes.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMediaTypes.cs
deleted file mode 100644
index 2d097f44f5..0000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMediaTypes.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using Umbraco.Core.Services;
-using umbraco.BusinessLogic.Actions;
-using umbraco.businesslogic;
-using umbraco.cms.presentation.Trees;
-using umbraco.interfaces;
-using Umbraco.Core;
-using Umbraco.Web.umbraco.presentation.umbraco.Trees;
-
-namespace umbraco
-{
-    [Obsolete("This class is no longer used and will be removed from the codebase in future versions")]
-    public class loadMediaTypes : BaseTree
-    {
-        public loadMediaTypes(string application) : base(application) { }
-
-        protected override void CreateRootNode(ref XmlTreeNode rootNode)
-        {
-            rootNode.NodeType = "init" + TreeAlias;
-            rootNode.NodeID = "init";
-        }
-
-        protected override void CreateAllowedActions(ref List<IAction> actions)
-        {
-            actions.Clear();
-            actions.Add(ActionNew.Instance);
-            actions.Add(ContextMenuSeperator.Instance);
-            actions.Add(ActionDelete.Instance);
-        }
-
-        public override void RenderJS(ref StringBuilder Javascript)
-        {
-            Javascript.Append(
-                @"
-function openMediaType(id) {
-	UmbClientMgr.contentFrame('settings/editMediaType.aspx?id=' + id);
-}
-");
-        }
-
-        public override void Render(ref XmlTree tree)
-        {
-            var mediaTypes = Service.GetMediaTypeChildren(base.m_id);
-
-            foreach (var mediaType in mediaTypes)
-            {
-                var hasChildren = Service.MediaTypeHasChildren(mediaType.Id);
-
-                XmlTreeNode xNode = XmlTreeNode.Create(this);
-                xNode.NodeID = mediaType.Id.ToString(CultureInfo.InvariantCulture);
-                xNode.Text = TranslateTreeNames.GetTranslatedName(mediaType.Name);
-                xNode.Action = string.Format("javascript:openMediaType({0});", mediaType.Id);
-                xNode.Icon = "icon-item-arrangement";
-                xNode.OpenIcon = "icon-item-arrangement";
-                xNode.Source = GetTreeServiceUrl(mediaType.Id);
-                xNode.HasChildren = hasChildren;
-          
-                OnBeforeNodeRender(ref tree, ref xNode, EventArgs.Empty);
-                if (xNode != null)
-                {
-                    tree.Add(xNode);
-                    OnAfterNodeRender(ref tree, ref xNode, EventArgs.Empty);
-                }
-                
-            }
-        }
-
-        private IContentTypeService Service
-        {
-            get { return Services.ContentTypeService; }
-        }
-    }
-}
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMemberTypes.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMemberTypes.cs
deleted file mode 100644
index 1df977c746..0000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMemberTypes.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-using System;
-using System.Text;
-using System.Xml;
-using Umbraco.Core.Security;
-using umbraco.businesslogic;
-using umbraco.cms.businesslogic.member;
-using umbraco.BusinessLogic.Utils;
-using umbraco.cms.presentation.Trees;
-using Umbraco.Core;
-
-
-namespace umbraco
-{
-    /// <summary>
-    /// Handles loading of the member types into the application tree
-    /// </summary>
-    [Obsolete("This class is no longer used and will be removed from the codebase in future versions")]
-    public class loadMemberTypes : BaseTree
-	{
-        public loadMemberTypes(string application) : base(application) { }
-
-        protected override void CreateRootNode(ref XmlTreeNode rootNode)
-        {
-            var provider = MembershipProviderExtensions.GetMembersMembershipProvider();
- 
-            // only show member types if we're using umbraco members on the website
-            if (provider.IsUmbracoMembershipProvider())
-            {
-				rootNode.NodeType = "init" + TreeAlias;
-				rootNode.NodeID = "init";
-            }
-            else
-            {
-                rootNode = null;
-            }
-        }
-
-		/// <summary>
-		/// Renders the Javascript.
-		/// </summary>
-		/// <param name="Javascript">The javascript.</param>
-		public override void RenderJS(ref StringBuilder Javascript)
-        {
-            Javascript.Append(
-                @"
-function openMemberType(id) {
-	UmbClientMgr.contentFrame('members/editMemberType.aspx?id=' + id);
-}
-");
-        }
-
-        /// <summary>
-        /// This will call the normal Render method by passing the converted XmlTree to an XmlDocument.
-        /// TODO: need to update this render method to do everything that the obsolete render method does and remove the obsolete method
-        /// </summary>
-        /// <param name="tree"></param>
-        public override void Render(ref XmlTree tree)
-        {
-            XmlDocument xDoc = new XmlDocument();
-            xDoc.LoadXml(tree.ToString(SerializedTreeType.XmlTree));
-            Render(ref xDoc);
-            tree = SerializableData.Deserialize(xDoc.OuterXml, typeof(XmlTree)) as XmlTree;
-			//ensure that the tree type is set! this wouldn't need to be done if BaseTree was implemented properly
-			foreach (XmlTreeNode node in tree)
-				node.TreeType = this.TreeAlias;
-        }
-
-		/// <summary>
-		/// Renders the specified tree item.
-		/// </summary>
-		/// <param name="Tree">The tree.</param>
-		public override void Render(ref XmlDocument Tree)
-        {
-            MemberType[] MemberTypes = MemberType.GetAll;
-            XmlNode root = Tree.DocumentElement;
-            for (int i = 0; i < MemberTypes.Length; i++)
-            {
-                XmlElement treeElement = Tree.CreateElement("tree");
-                treeElement.SetAttribute("menu", "D");
-                treeElement.SetAttribute("nodeID", MemberTypes[i].Id.ToString());
-                treeElement.SetAttribute("text", MemberTypes[i].Text);
-                treeElement.SetAttribute("action", "javascript:openMemberType(" + MemberTypes[i].Id + ");");
-                treeElement.SetAttribute("src", "");
-                treeElement.SetAttribute("icon", "icon-users");
-                treeElement.SetAttribute("openIcon", "icon-users");
-                treeElement.SetAttribute("nodeType", "memberTypes");
-                root.AppendChild(treeElement);
-            }
-        }
-	}
-    
-}
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadNodeTypes.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadNodeTypes.cs
deleted file mode 100644
index c2940a8a5d..0000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadNodeTypes.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using Umbraco.Core.Services;
-using umbraco.businesslogic;
-using umbraco.interfaces;
-using umbraco.BusinessLogic.Actions;
-using umbraco.cms.presentation.Trees;
-using Umbraco.Core;
-using Umbraco.Web.umbraco.presentation.umbraco.Trees;
-
-
-namespace umbraco
-{
-    [Obsolete("This class is no longer used and will be removed from the codebase in future versions")]
-    public class loadNodeTypes : BaseTree
-    {
-
-        public loadNodeTypes(string application) : base(application) { }
-
-        protected override void CreateRootNode(ref XmlTreeNode rootNode)
-        {
-            rootNode.NodeType = "init" + TreeAlias;
-            rootNode.NodeID = "init";
-        }
-
-        protected override void CreateRootNodeActions(ref List<IAction> actions)
-        {
-            actions.Clear();
-            actions.Add(ActionNew.Instance);
-            actions.Add(ContextMenuSeperator.Instance);
-            actions.Add(ActionImport.Instance);
-            actions.Add(ContextMenuSeperator.Instance);
-            actions.Add(ActionRefresh.Instance);
-        }
-
-        protected override void CreateAllowedActions(ref List<IAction> actions)
-        {
-            actions.Clear();
-            actions.Add(ActionNew.Instance);
-            actions.Add(ContextMenuSeperator.Instance);
-            actions.Add(ActionCopy.Instance);
-            actions.Add(ContextMenuSeperator.Instance);
-            actions.Add(ActionExport.Instance);
-            actions.Add(ContextMenuSeperator.Instance);
-            actions.Add(ActionDelete.Instance);
-            actions.Add(ContextMenuSeperator.Instance);
-            actions.Add(ActionRefresh.Instance);
-        }
-
-        public override void RenderJS(ref StringBuilder Javascript)
-        {
-            Javascript.Append(
-                @"
-function openNodeType(id) {
-	UmbClientMgr.contentFrame('settings/editNodeTypeNew.aspx?id=' + id);
-}
-");
-        }
-
-        public override void Render(ref XmlTree tree)
-        {
-            var docTypes = Service.GetContentTypeChildren(base.m_id);
-
-            foreach (var docType in docTypes)
-            {
-                var hasChildren = Service.HasChildren(docType.Id);
-
-                XmlTreeNode xNode = XmlTreeNode.Create(this);
-                xNode.NodeID = docType.Id.ToString(CultureInfo.InvariantCulture);
-                xNode.Text = TranslateTreeNames.GetTranslatedName(docType.Name);
-                xNode.Action = "javascript:openNodeType(" + docType.Id + ");";
-                xNode.Icon = "icon-item-arrangement";
-                xNode.OpenIcon = "icon-item-arrangement";
-                xNode.Source = GetTreeServiceUrl(docType.Id);
-                xNode.HasChildren = hasChildren;
-                
-
-                OnBeforeNodeRender(ref tree, ref xNode, EventArgs.Empty);
-                if (xNode != null)
-                {
-                    tree.Add(xNode);
-                    OnAfterNodeRender(ref tree, ref xNode, EventArgs.Empty);
-                }
-            }
-        }
-
-        private IContentTypeService Service
-        {
-            get { return Services.ContentTypeService; }
-        }
-    }
-}
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installedPackage.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installedPackage.aspx
index aa565cde1d..6f9ad54b0d 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installedPackage.aspx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installedPackage.aspx
@@ -2,7 +2,7 @@
 <%@ Register TagPrefix="cc2" Namespace="umbraco.uicontrols" Assembly="controls" %>
 <asp:Content ContentPlaceHolderID="head" runat="server">
     <script type="text/javascript">
-        function toggleDiv(id, gotoDiv) {
+        function toggleDiv(id) {
             var div = document.getElementById(id);
 
             if (div.style.display == "none")
diff --git a/src/umbraco.businesslogic/BasePages/UmbracoEnsuredPage.cs b/src/umbraco.businesslogic/BasePages/UmbracoEnsuredPage.cs
index 58362d50f2..b70d40b2bc 100644
--- a/src/umbraco.businesslogic/BasePages/UmbracoEnsuredPage.cs
+++ b/src/umbraco.businesslogic/BasePages/UmbracoEnsuredPage.cs
@@ -63,12 +63,6 @@ namespace umbraco.BasePages
             }
         }
 
-        [Obsolete("This constructor is not used and will be removed from the codebase in the future")]
-        public UmbracoEnsuredPage(string hest) : this()
-        {
-            
-        }
-
         /// <summary>
         /// If true then umbraco will force any window/frame to reload umbraco in the main window
         /// </summary>
diff --git a/src/umbraco.cms/businesslogic/ContentItem/ContentItem.cs b/src/umbraco.cms/businesslogic/ContentItem/ContentItem.cs
index 45a47f49f2..b5ea54e5bb 100644
--- a/src/umbraco.cms/businesslogic/ContentItem/ContentItem.cs
+++ b/src/umbraco.cms/businesslogic/ContentItem/ContentItem.cs
@@ -1,5 +1,4 @@
 using System;
-using Umbraco.Core;
 
 namespace umbraco.cms.businesslogic.contentitem
 {
@@ -8,33 +7,13 @@ namespace umbraco.cms.businesslogic.contentitem
 	/// </summary>
 	public class ContentItem : Content
 	{
-		private static Guid _objectType = new Guid(Constants.ObjectTypes.ContentItem);
-
-		public ContentItem(int id) : base(id)
+	    public ContentItem(int id) : base(id)
 		{
-			//
-			// TODO: Add constructor logic here
-			//
 		}
 		public ContentItem(Guid id) : base(id)
 		{
-			//
-			// TODO: Add constructor logic here
-			//
 		}
 
-
-        /// <summary>
-        /// Used to persist object changes to the database. In Version3.0 it's just a stub for future compatibility
-        /// </summary>
-
-        public override void Save()
-        {
-            base.Save();
-        }
-
-
-
 		public static void DeleteFromType(ContentItemType cit) 
 		{
             var objs = Content.getContentOfContentType(cit);
diff --git a/src/umbraco.cms/businesslogic/Packager/PackageActions/addStringToHtmlElement.cs b/src/umbraco.cms/businesslogic/Packager/PackageActions/addStringToHtmlElement.cs
index a96f2fc893..47cfd2e15c 100644
--- a/src/umbraco.cms/businesslogic/Packager/PackageActions/addStringToHtmlElement.cs
+++ b/src/umbraco.cms/businesslogic/Packager/PackageActions/addStringToHtmlElement.cs
@@ -39,7 +39,7 @@ namespace umbraco.cms.businesslogic.packager.standardPackageActions
             if (UmbracoConfig.For.UmbracoSettings().Templates.UseAspNetMasterPages)
 				value = tmp.EnsureMasterPageSyntax(value);
 
-			_addStringToHtmlElement(tmp, value, templateAlias, htmlElementId, position);
+			_addStringToHtmlElement(tmp, value, htmlElementId, position);
 
 			return true;
 		}
@@ -61,7 +61,7 @@ namespace umbraco.cms.businesslogic.packager.standardPackageActions
 			if (UmbracoConfig.For.UmbracoSettings().Templates.UseAspNetMasterPages)
 				value = tmp.EnsureMasterPageSyntax(value);
 
-			_removeStringFromHtmlElement(tmp, value, templateAlias, htmlElementId);
+			_removeStringFromHtmlElement(tmp, value, htmlElementId);
 			return true;
 		}
 
@@ -74,7 +74,7 @@ namespace umbraco.cms.businesslogic.packager.standardPackageActions
 			return "addStringToHtmlElement";
 		}
 
-		private void _addStringToHtmlElement(template.Template tmp, string value, string templateAlias, string htmlElementId, string position)
+		private void _addStringToHtmlElement(template.Template tmp, string value, string htmlElementId, string position)
 		{
 			bool hasAspNetContentBeginning = false;
 			string design = "";
@@ -128,7 +128,7 @@ namespace umbraco.cms.businesslogic.packager.standardPackageActions
 			}
 		}
 
-		private void _removeStringFromHtmlElement(template.Template tmp, string value, string templateAlias, string htmlElementId)
+		private void _removeStringFromHtmlElement(template.Template tmp, string value, string htmlElementId)
 		{
 			bool hasAspNetContentBeginning = false;
 			string design = "";
diff --git a/src/umbraco.cms/businesslogic/media/Media.cs b/src/umbraco.cms/businesslogic/media/Media.cs
index 8a843f89d6..80ae59faba 100644
--- a/src/umbraco.cms/businesslogic/media/Media.cs
+++ b/src/umbraco.cms/businesslogic/media/Media.cs
@@ -270,13 +270,6 @@ namespace umbraco.cms.businesslogic.media
             }
         }
 
-        [Obsolete("Obsolete, Use Umbraco.Core.Services.MediaService.GetDescendants()", false)]
-        public override IEnumerable GetDescendants()
-        {
-            var descendants = ApplicationContext.Current.Services.MediaService.GetDescendants(Id);
-            return descendants.Select(x => new Media(x));
-        }
-
         #endregion
 
         #region Protected methods
@@ -297,28 +290,7 @@ namespace umbraco.cms.businesslogic.media
 
             SetupNode(media);
         }
-        
-        [Obsolete("Obsolete, This method is no longer used")]
-        protected void PopulateMediaFromReader(IRecordsReader dr)
-        {
-            var hc = dr.GetInt("children") > 0;
-
-            SetupMediaForTree(dr.GetGuid("uniqueId")
-                , dr.GetShort("level")
-                , dr.GetInt("parentId")
-                , dr.GetInt("nodeUser")
-                , dr.GetString("path")
-                , dr.GetString("text")
-                , dr.GetDateTime("createDate")
-                , dr.GetString("icon")
-                , hc
-                , dr.GetString("alias")
-                , dr.GetString("thumbnail")
-                , dr.GetString("description")
-                , null
-                , dr.GetInt("contentTypeId")
-                , dr.GetBoolean("isContainer"));
-        } 
+      
         #endregion
 
         #region Private methods
@@ -336,16 +308,6 @@ namespace umbraco.cms.businesslogic.media
                 Version = MediaItem.Version;
         }
 
-        [Obsolete("Obsolete, This method is no longer needed", false)]
-        private void SetupMediaForTree(Guid uniqueId, int level, int parentId, int user, string path,
-                                          string text, DateTime createDate, string icon, bool hasChildren, string contentTypeAlias, string contentTypeThumb,
-                                            string contentTypeDesc, int? masterContentType, int contentTypeId, bool isContainer)
-        {
-            SetupNodeForTree(uniqueId, _objectType, level, parentId, user, path, text, createDate, hasChildren);
-            ContentType = new ContentType(contentTypeId, contentTypeAlias, icon, contentTypeThumb, masterContentType, isContainer);
-            ContentTypeIcon = icon;
-        }
-
         /// <summary>
         /// Used internally to permanently delete the data from the database
         /// </summary>      
diff --git a/src/umbraco.cms/businesslogic/relation/RelationType.cs b/src/umbraco.cms/businesslogic/relation/RelationType.cs
index bedb51e440..ed5b1a741a 100644
--- a/src/umbraco.cms/businesslogic/relation/RelationType.cs
+++ b/src/umbraco.cms/businesslogic/relation/RelationType.cs
@@ -4,9 +4,7 @@ using System.Linq;
 using System.Web;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
-using umbraco.BusinessLogic;
 using Umbraco.Core.Models;
-using umbraco.DataLayer;
 using System.Collections.Generic;
 using umbraco.cms.businesslogic.web;
 
@@ -24,12 +22,7 @@ namespace umbraco.cms.businesslogic.relation
 
 		#endregion
 
-        private static ISqlHelper SqlHelper
-        {
-            get { return Application.SqlHelper; }
-        }
-
-		#region Constructors
+	    #region Constructors
 
 	    /// <summary>
 	    /// Internal constructor to create a new relation type
diff --git a/src/umbraco.cms/businesslogic/web/Document.cs b/src/umbraco.cms/businesslogic/web/Document.cs
index 3f66f5056f..e0039e9d09 100644
--- a/src/umbraco.cms/businesslogic/web/Document.cs
+++ b/src/umbraco.cms/businesslogic/web/Document.cs
@@ -69,42 +69,7 @@ namespace umbraco.cms.businesslogic.web
         /// Initialize the document
         /// </summary>
         /// <param name="id">The id of the document</param>
-        public Document(Guid id) : base(id) { }
-
-        /// <summary>
-        /// Initializes a Document object with one SQL query instead of many
-        /// </summary>
-        /// <param name="optimizedMode"></param>
-        /// <param name="id"></param>
-        public Document(bool optimizedMode, int id)
-            : base(id, optimizedMode)
-        {
-            this._optimizedMode = optimizedMode;
-            if (optimizedMode)
-            {
-                ContentEntity = ApplicationContext.Current.Services.ContentService.GetById(id);
-                bool hasChildren = ApplicationContext.Current.Services.ContentService.HasChildren(id);
-                int templateId = ContentEntity.Template == null ? 0 : ContentEntity.Template.Id;
-
-                SetupDocumentForTree(ContentEntity.Key, ContentEntity.Level, ContentEntity.ParentId, ContentEntity.CreatorId,
-                                     ContentEntity.WriterId,
-                                     ContentEntity.Published, ContentEntity.Path, ContentEntity.Name, ContentEntity.CreateDate,
-                                     ContentEntity.UpdateDate, ContentEntity.UpdateDate, ContentEntity.ContentType.Icon, hasChildren,
-                                     ContentEntity.ContentType.Alias, ContentEntity.ContentType.Thumbnail,
-                                     ContentEntity.ContentType.Description, null, ContentEntity.ContentType.Id,
-                                     templateId, ContentEntity.ContentType.IsContainer);
-
-                var tmpReleaseDate = ContentEntity.ReleaseDate.HasValue ? ContentEntity.ReleaseDate.Value : new DateTime();
-                var tmpExpireDate = ContentEntity.ExpireDate.HasValue ? ContentEntity.ExpireDate.Value : new DateTime();
-                var creator = new User(ContentEntity.CreatorId, true);
-                var writer = new User(ContentEntity.WriterId, true);
-
-                InitializeContent(ContentEntity.ContentType.Id, ContentEntity.Version, ContentEntity.UpdateDate,
-                                  ContentEntity.ContentType.Icon);
-                InitializeDocument(creator, writer, ContentEntity.Name, templateId, tmpReleaseDate, tmpExpireDate,
-                                   ContentEntity.UpdateDate, ContentEntity.Published);
-            }
-        }
+        public Document(Guid id) : base(id) { }      
 
         /// <summary>
         /// Internal initialization of a legacy Document object using the new IUmbracoEntity object
@@ -169,54 +134,7 @@ namespace umbraco.cms.businesslogic.web
         #endregion
 
         #region Static Methods
-
-
-        /// <summary>
-        /// Creates a new document
-        /// </summary>
-        /// <param name="Name">The name (.Text property) of the document</param>
-        /// <param name="dct">The documenttype</param>
-        /// <param name="u">The usercontext under which the action are performed</param>
-        /// <param name="ParentId">The id of the parent to the document</param>
-        /// <returns>The newly created document</returns>
-        [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentService.CreateContent()", false)]
-        public static Document MakeNew(string Name, DocumentType dct, User u, int ParentId)
-        {
-            //allows you to cancel a document before anything goes to the DB
-            var newingArgs = new DocumentNewingEventArgs()
-                                 {
-                                     Text = Name,
-                                     DocumentType = dct,
-                                     User = u,
-                                     ParentId = ParentId
-                                 };
-            Document.OnNewing(newingArgs);
-            if (newingArgs.Cancel)
-            {
-                return null;
-            }
-
-            //Create a new IContent object based on the passed in DocumentType's alias, set the name and save it
-            IContent content = ApplicationContext.Current.Services.ContentService.CreateContentWithIdentity(Name, ParentId, dct.Alias, u.Id);
-            //The content object will only have the 'WasCancelled' flag set to 'True' if the 'Creating' event has been cancelled, so we return null.
-            if (((Entity)content).WasCancelled)
-                return null;
-
-            //read the whole object from the db
-            Document d = new Document(content);
-
-            //event
-            NewEventArgs e = new NewEventArgs();
-            d.OnNew(e);
-
-            // Log
-            LogHelper.Info<Document>(string.Format("New document {0}", d.Id));
-
-            // Save doc
-            d.Save();
-
-            return d;
-        }
+        
 
         /// <summary>
         /// Check if a node is a document
@@ -245,37 +163,7 @@ namespace umbraco.cms.businesslogic.web
             var content = ApplicationContext.Current.Services.ContentService.GetRootContent().OrderBy(x => x.SortOrder);
             return content.Select(c => new Document(c)).ToArray();
         }
-
-        public static int CountSubs(int parentId, bool publishedOnly)
-        {
-            if (!publishedOnly)
-            {
-                return CountSubs(parentId);
-            }
-
-            return ApplicationContext.Current.DatabaseContext.Database.ExecuteScalar<int>(
-                "SELECT COUNT(*) FROM (select distinct umbracoNode.id from umbracoNode INNER JOIN cmsDocument ON cmsDocument.published = 1 and cmsDocument.nodeId = umbracoNode.id WHERE ','+path+',' LIKE '%," +
-                parentId.ToString() + ",%') t");
-        }
-
-        /// <summary>
-        /// Deletes all documents of a type, will be invoked if a documenttype is deleted.
-        /// 
-        /// Note: use with care: this method can result in wast amount of data being deleted.
-        /// </summary>
-        /// <param name="dt">The type of which documents should be deleted</param>
-        [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentService.DeleteContentOfType()", false)]
-        public static void DeleteFromType(DocumentType dt)
-        {
-            ApplicationContext.Current.Services.ContentService.DeleteContentOfType(dt.Id);
-        }
-
-        [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentService.GetContentOfContentType()", false)]
-        public static IEnumerable<Document> GetDocumentsOfDocumentType(int docTypeId)
-        {
-            var contents = ApplicationContext.Current.Services.ContentService.GetContentOfContentType(docTypeId);
-            return contents.Select(x => new Document(x)).ToArray();
-        }
+        
 
         public static void RemoveTemplateFromDocument(int templateId)
         {
@@ -297,49 +185,7 @@ namespace umbraco.cms.businesslogic.web
             var list = children.Select(x => new Document(x));
             return list.ToArray();
         }
-
-        [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentService.GetChildrenByName()", false)]
-        public static List<Document> GetChildrenBySearch(int NodeId, string searchString)
-        {
-            var children = ApplicationContext.Current.Services.ContentService.GetChildrenByName(NodeId, searchString);
-            return children.Select(x => new Document(x)).ToList();
-        }
-                
-        /// <summary>
-        /// This will clear out the cmsContentXml table for all Documents (not media or members) and then
-        /// rebuild the xml for each Docuemtn item and store it in this table.
-        /// </summary>
-        /// <remarks>
-        /// This method is thread safe
-        /// </remarks>
-        [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentService.RePublishAll()", false)]
-        public static void RePublishAll()
-        {
-            ApplicationContext.Current.Services.ContentService.RePublishAll();
-        }
-
-
-        /// <summary>
-        /// Retrieve a list of documents with an expirationdate greater than today
-        /// </summary>
-        /// <returns>A list of documents with expirationdates than today</returns>
-        [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentService.GetContentForExpiration()", false)]
-        public static Document[] GetDocumentsForExpiration()
-        {
-            var contents = ApplicationContext.Current.Services.ContentService.GetContentForExpiration();
-            return contents.Select(x => new Document(x)).ToArray();
-        }
-
-        /// <summary>
-        /// Retrieve a list of documents with with releasedate greater than today
-        /// </summary>
-        /// <returns>Retrieve a list of documents with with releasedate greater than today</returns>
-        [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentService.GetContentForRelease()", false)]
-        public static Document[] GetDocumentsForRelease()
-        {
-            var contents = ApplicationContext.Current.Services.ContentService.GetContentForRelease();
-            return contents.Select(x => new Document(x)).ToArray();
-        }
+        
 
         #endregion
 
@@ -617,69 +463,7 @@ namespace umbraco.cms.businesslogic.web
         #endregion
 
         #region Public Methods
-
-        /// <summary>
-        /// Saves and executes handlers and events for the Send To Publication action.
-        /// </summary>
-        /// <param name="u">The User</param>
-        public bool SendToPublication(User u)
-        {
-            var e = new SendToPublishEventArgs();
-            FireBeforeSendToPublish(e);
-            if (e.Cancel == false)
-            {
-                var sent = ApplicationContext.Current.Services.ContentService.SendToPublication(ContentEntity, u.Id);
-                if (sent)
-                {
-                    FireAfterSendToPublish(e);
-                    return true;    
-                }
-            }
-
-            return false;
-
-        }
-
-
-        /// <summary>
-        /// Publishing a document
-        /// A xmlrepresentation of the document and its data are exposed to the runtime data
-        /// (an xmlrepresentation is added -or updated if the document previously are published) ,
-        /// this will lead to a new version of the document being created, for continuing editing of
-        /// the data.
-        /// </summary>
-        /// <param name="u">The usercontext under which the action are performed</param>
-        /// <returns>True if the publishing succeed. Possible causes for not publishing is if an event aborts the publishing</returns>
-        /// <remarks>        
-        /// This method needs to be marked with [MethodImpl(MethodImplOptions.Synchronized)]
-        /// because we execute multiple queries affecting the same data, if two thread are to do this at the same time for the same node we may have problems
-        /// </remarks>
-        [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentService.Publish()", false)]
-        public bool PublishWithResult(User u)
-        {
-            return PublishWithResult(u, true);
-        }
-
-        [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentService.Publish()", false)]
-        internal bool PublishWithResult(User u, bool omitCacheRefresh)
-        {
-            var e = new PublishEventArgs();
-            FireBeforePublish(e);
-
-            if (!e.Cancel)
-            {
-                var result = ApplicationContext.Current.Services.ContentService.PublishWithStatus(ContentEntity, u.Id);
-                _published = result.Success;
-                
-                FireAfterPublish(e);
-
-                return result.Success;
-            }
-            else
-            {
-                return false;
-            }
-        }
+        
 
         [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentService.PublishWithChildren()", false)]
         public bool PublishWithChildrenWithResult(User u)
@@ -689,68 +473,7 @@ namespace umbraco.cms.businesslogic.web
             // do the same thing for the moment
             return result.Single(x => x.Result.ContentItem.Id == Id).Success;
         }
-
-        /// <summary>
-        /// Rollbacks a document to a previous version, this will create a new version of the document and copy
-        /// all of the old documents data.
-        /// </summary>
-        /// <param name="u">The usercontext under which the action are performed</param>
-        /// <param name="VersionId">The unique Id of the version to roll back to</param>
-        [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentService.Rollback()", false)]
-        public void RollBack(Guid VersionId, User u)
-        {
-            var e = new RollBackEventArgs();
-            FireBeforeRollBack(e);
-
-            if (!e.Cancel)
-            {
-                ContentEntity = ApplicationContext.Current.Services.ContentService.Rollback(Id, VersionId, u.Id);
-
-                FireAfterRollBack(e);
-            }
-        }
-
-        /// <summary>
-        /// Recursive publishing.
-        /// 
-        /// Envoking this method will publish the documents and all children recursive.
-        /// </summary>
-        /// <param name="u">The usercontext under which the action are performed</param>
-        [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentService.PublishWithChildren()", false)]
-        public void PublishWithSubs(User u)
-        {
-            PublishEventArgs e = new PublishEventArgs();
-            FireBeforePublish(e);
-
-            if (!e.Cancel)
-            {
-                IEnumerable<Attempt<PublishStatus>> publishedResults = ApplicationContext.Current.Services.ContentService
-                    .PublishWithChildrenWithStatus(ContentEntity, u.Id);
-
-                FireAfterPublish(e);
-            }
-        }
-
-        [Obsolete("Don't use! Only used internally to support the legacy events", false)]
-        internal IEnumerable<Attempt<PublishStatus>> PublishWithSubs(int userId, bool includeUnpublished)
-        {
-            PublishEventArgs e = new PublishEventArgs();
-            FireBeforePublish(e);
-
-            IEnumerable<Attempt<PublishStatus>> publishedResults = Enumerable.Empty<Attempt<PublishStatus>>();
-
-            if (!e.Cancel)
-            {
-                publishedResults = ApplicationContext.Current.Services.ContentService
-                    .PublishWithChildrenWithStatus(ContentEntity, userId, includeUnpublished);
-
-                FireAfterPublish(e);
-            }
-
-            return publishedResults;
-        }
-
-    
+        
 
         [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentService.UnPublish()", false)]
         public void UnPublish()
@@ -765,118 +488,9 @@ namespace umbraco.cms.businesslogic.web
                 
                 FireAfterUnPublish(e);
             }
-        }
-
-      
-
-
-        [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentService.HasPublishedVersion()", false)]
-        public bool HasPublishedVersion()
-        {
-            return ContentEntity.HasPublishedVersion;
-        }
-
-        /// <summary>
-        /// Pending changes means that there have been property/data changes since the last published version.
-        /// This is determined by the comparing the version date to the updated date. if they are different by more than 2 seconds, 
-        /// then this is considered a change.
-        /// </summary>
-        /// <returns></returns>
-        [Obsolete("Obsolete, Instead of calling this just check if the latest version of the content is published", false)]
-        public bool HasPendingChanges()
-        {
-            return ContentEntity.Published == false && ((Umbraco.Core.Models.Content)ContentEntity).PublishedState != PublishedState.Unpublished;
-        }
-
-        /// <summary>
-        /// Used for rolling back documents to a previous version
-        /// </summary>
-        /// <returns> Previous published versions of the document</returns>
-        [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentService.GetVersions()", false)]
-        public DocumentVersionList[] GetVersions()
-        {
-            var versions = ApplicationContext.Current.Services.ContentService.GetVersions(Id);
-            return
-                versions.Select(x => new DocumentVersionList(x.Version, x.UpdateDate, x.Name, User.GetUser(x.CreatorId)))
-                        .ToArray();
-        }
-
-        /// <summary>
-        /// Returns the published version of this document
-        /// </summary>
-        /// <returns>The published version of this document</returns>
-        [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentService.GetPublishedVersion()", false)]
-        public DocumentVersionList GetPublishedVersion()
-        {
-            var version = ApplicationContext.Current.Services.ContentService.GetPublishedVersion(Id);
-            if (version == null)
-                return null;
-
-            return new DocumentVersionList(version.Version, version.UpdateDate, version.Name, User.GetUser(version.CreatorId));
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <returns>Returns a breadcrumlike path for the document like: /ancestorname/ancestorname</returns>
-        [Obsolete("Method is not used anywhere, so its marked for deletion")]
-        public string GetTextPath()
-        {
-            string tempPath = "";
-            string[] splitPath = Path.Split(".".ToCharArray());
-            for (int i = 1; i < Level; i++)
-            {
-                tempPath += new Document(int.Parse(splitPath[i])).Text + "/";
-            }
-            if (tempPath.Length > 0)
-                tempPath = tempPath.Substring(0, tempPath.Length - 1);
-            return tempPath;
-        }
-
-
-        /// <summary>
-        /// Creates a new document of the same type and copies all data from the current onto it. Due to backwards compatibility we can't return
-        /// the new Document, but it's included in the CopyEventArgs.Document if you subscribe to the AfterCopy event
-        /// </summary>
-        /// <param name="CopyTo">The parentid where the document should be copied to</param>
-        /// <param name="u">The usercontext under which the action are performed</param>
-        [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentService.Copy()", false)]
-        public Document Copy(int CopyTo, User u)
-        {
-            return Copy(CopyTo, u, false);
-        }
-
-        /// <summary>
-        /// Creates a new document of the same type and copies all data from the current onto it. Due to backwards compatibility we can't return
-        /// the new Document, but it's included in the CopyEventArgs.Document if you subscribe to the AfterCopy event
-        /// </summary>
-        /// <param name="CopyTo"></param>
-        /// <param name="u"></param>
-        /// <param name="RelateToOrignal"></param>
-        [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentService.Copy()", false)]
-        public Document Copy(int CopyTo, User u, bool RelateToOrignal)
-        {
-            var e = new CopyEventArgs();
-            e.CopyTo = CopyTo;
-            FireBeforeCopy(e);
-            Document newDoc = null;
-
-            if (!e.Cancel)
-            {
-                // Make the new document
-                var content = ApplicationContext.Current.Services.ContentService.Copy(ContentEntity, CopyTo, RelateToOrignal, u.Id);
-                newDoc = new Document(content);
-                
-                // Then save to preserve any changes made by action handlers
-                newDoc.Save();
-
-                e.NewDocument = newDoc;
-                FireAfterCopy(e);
-            }
-
-            return newDoc;
-        }
+        }      
 
+        
         /// <summary>
         /// Puts the current document in the trash
         /// </summary>
@@ -903,20 +517,6 @@ namespace umbraco.cms.businesslogic.web
             }
         }
 
-        /// <summary>
-        /// Returns all decendants of the current document
-        /// </summary>
-        /// <returns></returns>
-        [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentService.GetDescendants()", false)]
-        public override IEnumerable GetDescendants()
-        {
-            var descendants = ContentEntity == null
-                                  ? ApplicationContext.Current.Services.ContentService.GetDescendants(Id)
-                                  : ApplicationContext.Current.Services.ContentService.GetDescendants(ContentEntity);
-
-            return descendants.Select(x => new Document(x.Id, true));
-        }        
-
         public override List<CMSPreviewNode> GetNodesForPreview(bool childrenOnly)
         {
             var nodes = new List<CMSPreviewNode>();
@@ -930,16 +530,7 @@ namespace umbraco.cms.businesslogic.web
 
             return nodes;
         }
-
-
-        /// <summary>
-        /// Method to remove an assigned template from a document
-        /// </summary>
-        public void RemoveTemplate()
-        {
-            Template = 0;
-        }
-
+        
         #endregion
 
         #region Protected Methods
@@ -1015,91 +606,9 @@ namespace umbraco.cms.businesslogic.web
             _published = InitPublished;
         }
 
-        [Obsolete("Obsolete", false)]
-        protected void PopulateDocumentFromReader(IRecordsReader dr)
-        {
-            var hc = dr.GetInt("children") > 0;
-
-            SetupDocumentForTree(dr.GetGuid("uniqueId")
-                , dr.GetShort("level")
-                , dr.GetInt("parentId")
-                , dr.GetInt("nodeUser")
-                , dr.GetInt("documentUser")
-                , !dr.GetBoolean("trashed") && (dr.GetInt("isPublished") == 1) //set published... double check trashed property
-                , dr.GetString("path")
-                , dr.GetString("text")
-                , dr.GetDateTime("createDate")
-                , dr.GetDateTime("updateDate")
-                , dr.GetDateTime("versionDate")
-                , dr.GetString("icon")
-                , hc
-                , dr.GetString("alias")
-                , dr.GetString("thumbnail")
-                , dr.GetString("description")
-                     , null
-                , dr.GetInt("contentTypeId")
-                     , dr.GetInt("templateId")
-                     , dr.GetBoolean("isContainer"));
-
-            if (!dr.IsNull("releaseDate"))
-                _release = dr.GetDateTime("releaseDate");
-            if (!dr.IsNull("expireDate"))
-                _expire = dr.GetDateTime("expireDate");
-        }
-
-
         #endregion
 
-        #region Private Methods
-        [Obsolete("Obsolete", false)]
-        private void SetupDocumentForTree(Guid uniqueId, int level, int parentId, int creator, int writer, bool publish, string path,
-                                         string text, DateTime createDate, DateTime updateDate,
-                                         DateTime versionDate, string icon, bool hasChildren, string contentTypeAlias, string contentTypeThumb,
-                                           string contentTypeDesc, int? masterContentType, int contentTypeId, int templateId, bool isContainer)
-        {
-            SetupNodeForTree(uniqueId, _objectType, level, parentId, creator, path, text, createDate, hasChildren);
-
-            _writerId = writer;
-            _published = publish;
-            _updated = updateDate;
-            _template = templateId;
-            ContentType = new ContentType(contentTypeId, contentTypeAlias, icon, contentTypeThumb, null, isContainer);
-            ContentTypeIcon = icon;
-            VersionDate = versionDate;
-        }
-
-        private XmlAttribute addAttribute(XmlDocument Xd, string Name, string Value)
-        {
-            XmlAttribute temp = Xd.CreateAttribute(Name);
-            temp.Value = Value;
-            return temp;
-        }
-
-        /// <summary>
-        /// This needs to be synchronized since we're doing multiple sql operations in the single method
-        /// </summary>
-        /// <param name="x"></param>
-        [MethodImpl(MethodImplOptions.Synchronized)]
-        private void saveXml(XmlNode x)
-        {
-            bool exists = (SqlHelper.ExecuteScalar<int>("SELECT COUNT(nodeId) FROM cmsContentXml WHERE nodeId=@nodeId",
-                                            SqlHelper.CreateParameter("@nodeId", Id)) != 0);
-            string sql = exists ? "UPDATE cmsContentXml SET xml = @xml WHERE nodeId=@nodeId"
-                                : "INSERT INTO cmsContentXml(nodeId, xml) VALUES (@nodeId, @xml)";
-            SqlHelper.ExecuteNonQuery(sql,
-                                      SqlHelper.CreateParameter("@nodeId", Id),
-                                      SqlHelper.CreateParameter("@xml", x.OuterXml));
-        }
-
-        private XmlNode importXml()
-        {
-            XmlDocument xmlDoc = new XmlDocument();
-            XmlReader xmlRdr = SqlHelper.ExecuteXmlReader(string.Format(
-                                                       "select xml from cmsContentXml where nodeID = {0}", Id));
-            xmlDoc.Load(xmlRdr);
-
-            return xmlDoc.FirstChild;
-        }
+        #region Private Methods       
 
         /// <summary>
         /// Used internally to permanently delete the data from the database
@@ -1163,100 +672,22 @@ namespace umbraco.cms.businesslogic.web
 
         #region Events
 
-        /// <summary>
-        /// The save event handler
-        /// </summary>
-        public delegate void SaveEventHandler(Document sender, SaveEventArgs e);
-        /// <summary>
-        /// The New event handler
-        /// </summary>
-        public delegate void NewEventHandler(Document sender, NewEventArgs e);
         /// <summary>
         /// The delete  event handler
         /// </summary>
         public delegate void DeleteEventHandler(Document sender, DeleteEventArgs e);
         /// <summary>
-        /// The publish event handler
-        /// </summary>
-        public delegate void PublishEventHandler(Document sender, PublishEventArgs e);
-        /// <summary>
-        /// The Send To Publish event handler
-        /// </summary>
-        public delegate void SendToPublishEventHandler(Document sender, SendToPublishEventArgs e);
-        /// <summary>
         /// The unpublish event handler
         /// </summary>
         public delegate void UnPublishEventHandler(Document sender, UnPublishEventArgs e);
-        /// <summary>
-        /// The copy event handler
-        /// </summary>
-        public delegate void CopyEventHandler(Document sender, CopyEventArgs e);
-        /// <summary>
-        /// The rollback event handler
-        /// </summary>
-        public delegate void RollBackEventHandler(Document sender, RollBackEventArgs e);
-
+        
+        
         /// <summary>
         /// The Move to trash event handler
         /// </summary>
         public delegate void MoveToTrashEventHandler(Document sender, MoveToTrashEventArgs e);
-
-        /// <summary>
-        /// Occurs when [before save].
-        /// </summary>
-        public new static event SaveEventHandler BeforeSave;
-        /// <summary>
-        /// Raises the <see cref="E:BeforeSave"/> event.
-        /// </summary>
-        /// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
-        protected internal new virtual void FireBeforeSave(SaveEventArgs e)
-        {
-            if (BeforeSave != null)
-            {
-                BeforeSave(this, e);
-            }
-        }
-
-        /// <summary>
-        /// Occurs when [after save].
-        /// </summary>
-        public new static event SaveEventHandler AfterSave;
-        /// <summary>
-        /// Raises the <see cref="E:AfterSave"/> event.
-        /// </summary>
-        /// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
-        protected new virtual void FireAfterSave(SaveEventArgs e)
-        {
-            if (AfterSave != null)
-            {
-                AfterSave(new Document(this.Id), e);
-            }
-        }
-
-        /// <summary>
-        /// Occurs when [new].
-        /// </summary>
-        public static event NewEventHandler New;
-        /// <summary>
-        /// Raises the <see cref="E:New"/> event.
-        /// </summary>
-        /// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
-        protected virtual void OnNew(NewEventArgs e)
-        {
-            if (New != null)
-                New(this, e);
-        }
-
-        //TODO: Slace - Document this
-        public static event EventHandler<DocumentNewingEventArgs> Newing;
-        protected static void OnNewing(DocumentNewingEventArgs e)
-        {
-            if (Newing != null)
-            {
-                Newing(null, e);
-            }
-        }
-
+        
+        
         /// <summary>
         /// Occurs when [before delete].
         /// </summary>
@@ -1316,63 +747,8 @@ namespace umbraco.cms.businesslogic.web
             if (AfterMoveToTrash != null)
                 AfterMoveToTrash(this, e);
         }
-
-        /// <summary>
-        /// Occurs when [before publish].
-        /// </summary>
-        public static event PublishEventHandler BeforePublish;
-        /// <summary>
-        /// Raises the <see cref="E:BeforePublish"/> event.
-        /// </summary>
-        /// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
-        protected virtual void FireBeforePublish(PublishEventArgs e)
-        {
-            if (BeforePublish != null)
-                BeforePublish(this, e);
-        }
-
-        /// <summary>
-        /// Occurs when [after publish].
-        /// </summary>
-        public static event PublishEventHandler AfterPublish;
-        /// <summary>
-        /// Raises the <see cref="E:AfterPublish"/> event.
-        /// </summary>
-        /// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
-        protected virtual void FireAfterPublish(PublishEventArgs e)
-        {
-            if (AfterPublish != null)
-                AfterPublish(this, e);
-        }
-        /// <summary>
-        /// Occurs when [before publish].
-        /// </summary>
-        public static event SendToPublishEventHandler BeforeSendToPublish;
-        /// <summary>
-        /// Raises the <see cref="E:BeforePublish"/> event.
-        /// </summary>
-        /// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
-        protected virtual void FireBeforeSendToPublish(SendToPublishEventArgs e)
-        {
-            if (BeforeSendToPublish != null)
-                BeforeSendToPublish(this, e);
-        }
-
-
-        /// <summary>
-        /// Occurs when [after publish].
-        /// </summary>
-        public static event SendToPublishEventHandler AfterSendToPublish;
-        /// <summary>
-        /// Raises the <see cref="E:AfterPublish"/> event.
-        /// </summary>
-        /// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
-        protected virtual void FireAfterSendToPublish(SendToPublishEventArgs e)
-        {
-            if (AfterSendToPublish != null)
-                AfterSendToPublish(this, e);
-        }
-
+        
+        
         /// <summary>
         /// Occurs when [before un publish].
         /// </summary>
@@ -1400,62 +776,8 @@ namespace umbraco.cms.businesslogic.web
             if (AfterUnPublish != null)
                 AfterUnPublish(this, e);
         }
-
-        /// <summary>
-        /// Occurs when [before copy].
-        /// </summary>
-        public static event CopyEventHandler BeforeCopy;
-        /// <summary>
-        /// Raises the <see cref="E:BeforeCopy"/> event.
-        /// </summary>
-        /// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
-        protected virtual void FireBeforeCopy(CopyEventArgs e)
-        {
-            if (BeforeCopy != null)
-                BeforeCopy(this, e);
-        }
-
-        /// <summary>
-        /// Occurs when [after copy].
-        /// </summary>
-        public static event CopyEventHandler AfterCopy;
-        /// <summary>
-        /// Raises the <see cref="E:AfterCopy"/> event.
-        /// </summary>
-        /// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
-        protected virtual void FireAfterCopy(CopyEventArgs e)
-        {
-            if (AfterCopy != null)
-                AfterCopy(this, e);
-        }
-
-        /// <summary>
-        /// Occurs when [before roll back].
-        /// </summary>
-        public static event RollBackEventHandler BeforeRollBack;
-        /// <summary>
-        /// Raises the <see cref="E:BeforeRollBack"/> event.
-        /// </summary>
-        /// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
-        protected virtual void FireBeforeRollBack(RollBackEventArgs e)
-        {
-            if (BeforeRollBack != null)
-                BeforeRollBack(this, e);
-        }
-
-        /// <summary>
-        /// Occurs when [after roll back].
-        /// </summary>
-        public static event RollBackEventHandler AfterRollBack;
-        /// <summary>
-        /// Raises the <see cref="E:AfterRollBack"/> event.
-        /// </summary>
-        /// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
-        protected virtual void FireAfterRollBack(RollBackEventArgs e)
-        {
-            if (AfterRollBack != null)
-                AfterRollBack(this, e);
-        }
+        
+        
         #endregion
 
 
diff --git a/src/umbraco.cms/businesslogic/web/StyleSheet.cs b/src/umbraco.cms/businesslogic/web/StyleSheet.cs
index b95e81bc67..7a0902ebb3 100644
--- a/src/umbraco.cms/businesslogic/web/StyleSheet.cs
+++ b/src/umbraco.cms/businesslogic/web/StyleSheet.cs
@@ -69,12 +69,6 @@ namespace umbraco.cms.businesslogic.web
         {
         }
 
-        [Obsolete("This constructors parameters: setupStyleProperties, loadContentFromFile don't do anything")]
-        public StyleSheet(int id, bool setupStyleProperties, bool loadContentFromFile)
-            : base(id)
-        {
-        }
-
         /// <summary>
         /// Sort order does nothing for Stylesheets
         /// </summary>
diff --git a/src/umbraco.controls/Panel.cs b/src/umbraco.controls/Panel.cs
index 0149627da5..f689ae785a 100644
--- a/src/umbraco.controls/Panel.cs
+++ b/src/umbraco.controls/Panel.cs
@@ -16,15 +16,7 @@ namespace umbraco.uicontrols
     public class UmbracoPanel : Panel
     {
         private ScrollingMenu _menu = new ScrollingMenu();
-        public UmbracoPanel()
-        {
-
-        }
-        public UmbracoPanel(object input)
-        {
-
-        }
-
+        
         private bool _hasMenu = false;
         private string _StatusBarText = "";
         private string _text;