diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/EditorDefinition.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/EditorDefinition.cs
index 59f03084..89d03a1f 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/EditorDefinition.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/EditorDefinition.cs
@@ -3,7 +3,7 @@ using System.Windows;
 
 namespace Microsoft.Windows.Controls.PropertyGrid
 {
-    public class EditorDefinition : IEditorDefinition
+    public class EditorDefinition
     {
         public DataTemplate EditorTemplate { get; set; }
 
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/EditorDefinitionCollection.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/EditorDefinitionCollection.cs
index a67adc7d..8d0d37ad 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/EditorDefinitionCollection.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/EditorDefinitionCollection.cs
@@ -4,9 +4,9 @@ using System.Collections.ObjectModel;
 
 namespace Microsoft.Windows.Controls.PropertyGrid
 {
-    public class EditorDefinitionCollection : ObservableCollection<IEditorDefinition>
+    public class EditorDefinitionCollection : ObservableCollection<EditorDefinition>
     {
-        public IEditorDefinition this[string propertyName]
+        public EditorDefinition this[string propertyName]
         {
             get
             {
@@ -20,7 +20,7 @@ namespace Microsoft.Windows.Controls.PropertyGrid
             }
         }
 
-        public IEditorDefinition this[Type targetType]
+        public EditorDefinition this[Type targetType]
         {
             get
             {
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyGridUtilities.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyGridUtilities.cs
index 20c7cea1..a0cf9e0a 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyGridUtilities.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyGridUtilities.cs
@@ -128,7 +128,7 @@ namespace Microsoft.Windows.Controls.PropertyGrid
             if (customTypeEditors.Count > 0)
             {
                 //first check if the custom editor is type based
-                IEditorDefinition customEditor = customTypeEditors[propertyItem.PropertyType];
+                EditorDefinition customEditor = customTypeEditors[propertyItem.PropertyType];
                 if (customEditor == null)
                 {
                     //must be property based
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WPFToolkit.Extended.csproj b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WPFToolkit.Extended.csproj
index 862120a9..51e5764e 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WPFToolkit.Extended.csproj
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WPFToolkit.Extended.csproj
@@ -261,7 +261,6 @@
     <Compile Include="PropertyGrid\Implementation\Editors\FontComboBoxEditor.cs" />
     <Compile Include="PropertyGrid\Implementation\Editors\ItemsSourceEditor.cs" />
     <Compile Include="PropertyGrid\Implementation\Editors\TimeSpanEditor.cs" />
-    <Compile Include="PropertyGrid\Implementation\IEditorDefinition.cs" />
     <Compile Include="PropertyGrid\Implementation\Editors\IntegerUpDownEditor.cs" />
     <Compile Include="PropertyGrid\Implementation\Editors\ITypeEditor.cs" />
     <Compile Include="PropertyGrid\Implementation\Editors\PrimitiveTypeCollectionEditor.cs" />