diff --git a/src/Umbraco.Core/Constants-PropertyEditors.cs b/src/Umbraco.Core/Constants-PropertyEditors.cs
index 43bd381571..f6fa5a443c 100644
--- a/src/Umbraco.Core/Constants-PropertyEditors.cs
+++ b/src/Umbraco.Core/Constants-PropertyEditors.cs
@@ -68,12 +68,7 @@ namespace Umbraco.Core
                 /// DropDown List.
                 /// </summary>
                 public const string DropDownListFlexible = "Umbraco.DropDown.Flexible";
-
-                /// <summary>
-                /// Folder Browser.
-                /// </summary>
-                public const string FolderBrowser = "Umbraco.FolderBrowser";
-
+                
                 /// <summary>
                 /// Grid.
                 /// </summary>
@@ -193,17 +188,7 @@ namespace Umbraco.Core
                 /// Upload Field.
                 /// </summary>
                 public const string UploadField = "Umbraco.UploadField";
-
-                /// <summary>
-                /// XPatch Checkbox List.
-                /// </summary>
-                public const string XPathCheckBoxList = "Umbraco.XPathCheckBoxList";
-
-                /// <summary>
-                /// XPath DropDown List.
-                /// </summary>
-                public const string XPathDropDownList = "Umbraco.XPathDropDownList";
-
+                
                 /// <summary>
                 /// Email Address.
                 /// </summary>
diff --git a/src/Umbraco.Web/PropertyEditors/ParameterEditors/MultipleContentPickerParameterEditor.cs b/src/Umbraco.Web/PropertyEditors/ParameterEditors/MultipleContentPickerParameterEditor.cs
index 27d1076352..3d0d0eb923 100644
--- a/src/Umbraco.Web/PropertyEditors/ParameterEditors/MultipleContentPickerParameterEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/ParameterEditors/MultipleContentPickerParameterEditor.cs
@@ -1,16 +1,25 @@
 using Umbraco.Core;
+using Umbraco.Core.Logging;
 using Umbraco.Core.PropertyEditors;
 
 namespace Umbraco.Web.PropertyEditors.ParameterEditors
 {
-    [ParameterEditor(Constants.PropertyEditors.MultiNodeTreePickerAlias, "Multiple Content Picker", "contentpicker")]
-    public class MultipleContentPickerParameterEditor : ParameterEditor
+    /// <summary>
+    /// Represents a parameter editor of some sort.
+    /// </summary>
+    [DataEditor(Constants.PropertyEditors.Aliases.MultiNodeTreePicker, EditorType.MacroParameter, "Multiple Content Picker", "contentpicker")]
+    public class MultipleContentPickerParameterEditor : DataEditor
     {
-        public MultipleContentPickerParameterEditor()
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MultipleContentPickerParameterEditor"/> class.
+        /// </summary>
+        public MultipleContentPickerParameterEditor(ILogger logger)
+            : base(logger)
         {
-            Configuration.Add("multiPicker", "1");
-            Configuration.Add("minNumber",0 );
-            Configuration.Add("maxNumber", 0);
+            // configure
+            DefaultConfiguration.Add("multiPicker", "1");
+            DefaultConfiguration.Add("minNumber",0 );
+            DefaultConfiguration.Add("maxNumber", 0);
         }
     }
 }
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index ded8f443ba..7691f294db 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -315,6 +315,7 @@
     <Compile Include="PropertyEditors\NestedContentConfigurationEditor.cs" />
     <Compile Include="PropertyEditors\NestedContentController.cs" />
     <Compile Include="PropertyEditors\NestedContentPropertyEditor.cs" />
+    <Compile Include="PropertyEditors\ParameterEditors\MultipleContentPickerParameterEditor.cs" />
     <Compile Include="PropertyEditors\PropertyEditorsComponent.cs" />
     <Compile Include="PropertyEditors\RelatedLinksPropertyEditor.cs" />
     <Compile Include="PropertyEditors\RelatedLinksConfiguration.cs" />