diff --git a/src/Umbraco.Web/PropertyEditors/MultiNodePickerPreValueEditor.cs b/src/Umbraco.Web/PropertyEditors/MultiNodePickerPreValueEditor.cs
index f438a8f650..bc35ae7fae 100644
--- a/src/Umbraco.Web/PropertyEditors/MultiNodePickerPreValueEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/MultiNodePickerPreValueEditor.cs
@@ -10,24 +10,24 @@ namespace Umbraco.Web.PropertyEditors
     public class MultiNodePickerPreValueEditor : PreValueEditor
     {
         
-        [PreValueField("type", "Type", "views/prevalueEditors/nodetype.html")]
+        [PreValueField("type", "Type", "nodetype")]
         public string Type { get; set; }
 
-        [PreValueField("startNode", "Start node", "views/prevalueEditors/treePicker.html")]
+        [PreValueField("startNode", "Start node", "treepicker")]
         public int StartNode { get; set; }
 
-        [PreValueField("multiPicker", "Pick multiple items", "views/prevalueEditors/boolean.html")]
+        [PreValueField("multiPicker", "Pick multiple items", "boolean")]
         public bool MultiPicker { get; set; }
 
 
 
-        [PreValueField("filter", "Filter out items with type", "views/prevalueEditors/textstring.html", Description = "Seperate with comma")]
+        [PreValueField("filter", "Filter out items with type", "textstring", Description = "Seperate with comma")]
         public string Filter { get; set; }
 
-        [PreValueField("minNumber", "Minumum number of items", "views/prevalueEditors/number.html")]
+        [PreValueField("minNumber", "Minumum number of items", "number")]
         public string MinNumber { get; set; }
 
-        [PreValueField("maxNumber", "Maximum number of items", "views/prevalueEditors/number.html")]
+        [PreValueField("maxNumber", "Maximum number of items", "number")]
         public string MaxNumber { get; set; }
        
     }
diff --git a/src/Umbraco.Web/PropertyEditors/RteMacroRenderingPropertyValueConverter.cs b/src/Umbraco.Web/PropertyEditors/RteMacroRenderingPropertyValueConverter.cs
deleted file mode 100644
index fc72657212..0000000000
--- a/src/Umbraco.Web/PropertyEditors/RteMacroRenderingPropertyValueConverter.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Web;
-using Umbraco.Core;
-using Umbraco.Core.Macros;
-using Umbraco.Core.Models;
-using Umbraco.Core.PropertyEditors;
-
-namespace Umbraco.Web.PropertyEditors
-{
-	/// <summary>
-	/// A value converter for TinyMCE that will ensure any macro content is rendered properly even when 
-	/// used dynamically.
-	/// </summary>
-	internal class RteMacroRenderingPropertyValueConverter : TinyMcePropertyValueConverter
-	{
-        /// <summary>
-        /// Return IHtmlString so devs doesn't need to decode html
-        /// </summary>
-        /// <param name="valueToConvert"></param>
-        /// <param name="propertyDefinition"></param>
-        /// <param name="isPreviewing"></param>
-        /// <returns></returns>
-        public override Attempt<object> ConvertSourceToObject(object valueToConvert, PublishedPropertyDefinition propertyDefinition, bool isPreviewing)
-        {
-            //we're going to send the string through the macro parser and create the output string.
-            var sb = new StringBuilder();
-            var umbracoHelper = new UmbracoHelper(UmbracoContext.Current);
-            MacroTagParser.ParseMacros(
-                valueToConvert.ToString(),
-                //callback for when text block is found
-                textBlock => sb.Append(textBlock),
-                //callback for when macro syntax is found
-                (macroAlias, macroAttributes) => sb.Append(umbracoHelper.RenderMacro(
-                    macroAlias,
-                    //needs to be explicitly casted to Dictionary<string, object>
-                    macroAttributes.ConvertTo(x => (string)x, x => (object)x)).ToString()));
-
-            return new Attempt<object>(true, new HtmlString(sb.ToString()));
-        }
-
-	}
-}
\ No newline at end of file