diff --git a/src/Umbraco.Web/Media/EmbedProviders/Flickr.cs b/src/Umbraco.Web/Media/EmbedProviders/Flickr.cs
deleted file mode 100644
index 7d6c887d4a..0000000000
--- a/src/Umbraco.Web/Media/EmbedProviders/Flickr.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System;
-using System.ComponentModel;
-using System.Web;
-
-namespace Umbraco.Web.Media.EmbedProviders
-{
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    [Obsolete("This is no longer used and will be removed from the codebase in the future, for Flickr, use the Umbraco.Web.Media.EmbedProviders.OEmbedPhoto provider")]
-    public class Flickr : AbstractOEmbedProvider
-    {
-        public override string GetMarkup(string url, int maxWidth, int maxHeight)
-        {
-            var flickrUrl = BuildFullUrl(url, maxWidth, maxHeight);
-            var doc = GetXmlResponse(flickrUrl);
-
-            string imageUrl = doc.SelectSingleNode("/oembed/url").InnerText;
-            string imageWidth = doc.SelectSingleNode("/oembed/width").InnerText;
-            string imageHeight = doc.SelectSingleNode("/oembed/height").InnerText;
-            string imageTitle = doc.SelectSingleNode("/oembed/title").InnerText;
-
-            return string.Format("<img src=\"{0}\" width\"{1}\" height=\"{2}\" alt=\"{3}\" />",
-                imageUrl, imageWidth, imageHeight, HttpUtility.HtmlEncode(imageTitle));
-        }
-    }
-}
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index f266213da0..82db233a38 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -485,7 +485,6 @@
     <Compile Include="Models\Trees\TreeNode.cs" />
     <Compile Include="Routing\NotFoundHandlerHelper.cs" />
     <Compile Include="Models\ContentEditing\DocumentTypeDisplay.cs" />
-    <Compile Include="Media\EmbedProviders\Flickr.cs" />
     <Compile Include="Models\ContentEditing\ContentTypeCompositionDisplay.cs" />
     <Compile Include="Models\ContentEditing\ContentTypeSave.cs" />
     <Compile Include="Models\ContentEditing\DocumentTypeSave.cs" />
@@ -1281,9 +1280,6 @@
     <Compile Include="umbraco.presentation\umbraco\dialogs\SendPublish.aspx.designer.cs">
       <DependentUpon>SendPublish.aspx</DependentUpon>
     </Compile>
-    <Compile Include="umbraco.presentation\umbraco\create\dialogHandler_temp.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="umbraco.presentation\umbraco\developer\Packages\editPackage.aspx.cs">
       <DependentUpon>editPackage.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/dialogHandler_temp.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/dialogHandler_temp.cs
deleted file mode 100644
index de494494f5..0000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/dialogHandler_temp.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System;
-using System.Web;
-using Umbraco.Web.UI;
-using Umbraco.Web;
-using Umbraco.Web._Legacy.UI;
-
-namespace umbraco.presentation.create
-{
-    /// <summary>
-    /// Summary description for dialogHandler_temp.
-    /// </summary>
-    [Obsolete("This class is no longer used, it has been replaced by Umbraco.Web.UI.LegacyDialogHandler which will also eventually be deprecated")]
-    public class dialogHandler_temp
-    {
-        public static void Delete(string NodeType, int NodeId)
-        {
-            Delete(NodeType, NodeId, "");
-        }
-        public static void Delete(string NodeType, int NodeId, string Text)
-        {
-            LegacyDialogHandler.Delete(
-                new HttpContextWrapper(HttpContext.Current),
-                UmbracoContext.Current.Security.CurrentUser,
-                NodeType, NodeId, Text);
-        }
-
-        public static string Create(string NodeType, int NodeId, string Text)
-        {
-            return Create(NodeType, 0, NodeId, Text);
-        }
-
-        public static string Create(string NodeType, int TypeId, int NodeId, string Text)
-        {
-            return LegacyDialogHandler.Create(
-                new HttpContextWrapper(HttpContext.Current),
-                UmbracoContext.Current.Security.CurrentUser,
-                NodeType, NodeId, Text, TypeId);
-        }
-    }
-}