Cleanup project after merge

src/Umbraco.Core/Models/PublishedContent/PublishedContentType.cs

@@ -121,7 +121,7 @@ namespace Umbraco.Core.Models.PublishedContent
             // properties ie both its own properties and those that were inherited (it's based upon an
             // IContentTypeComposition) and so every PublishedContentType having a property based upon
             // the cleared data type, be it local or inherited, will be cleared.
-            ApplicationContext.Current.ApplicationCache.StaticCache.ClearCacheObjectTypes<PublishedContentType>( // fixme NOT!
+            ApplicationContext.Current.ApplicationCache.StaticCache.ClearCacheObjectTypes<PublishedContentType>(
                 (key, value) => value.PropertyTypes.Any(x => x.DataTypeId == id));
         }
 

src/Umbraco.Core/PropertyEditors/PropertyValueConverter.cs

@@ -1,18 +0,0 @@
-using Umbraco.Core.Models;
-
-// fixme - delete file
-//namespace Umbraco.Core.PropertyEditors
-//{
-//    /// <summary>
-//    /// Used to convert property values from various sources to various destination formats for use with caching
-//    /// </summary>
-//    public abstract class PropertyValueConverter
-//    {
-//        /// <summary>
-//        /// Returns the alias of the PropertyEditor that this converter is for
-//        /// </summary>
-//        public abstract string AssociatedPropertyEditorAlias { get; }
-
-//        public abstract Attempt<object> ConvertSourceToObject(object valueToConvert, PublishedPropertyDefinition propertyDefinition, bool isPreviewing);
-//    }
-//}

src/Umbraco.Core/Umbraco.Core.csproj

@@ -745,7 +745,6 @@
     <Compile Include="PropertyEditors\PropertyEditor.cs" />
     <Compile Include="PropertyEditors\PropertyEditorAttribute.cs" />
     <Compile Include="PropertyEditors\PropertyEditorResolver.cs" />
-    <Compile Include="PropertyEditors\PropertyValueConverter.cs" />
     <Compile Include="PropertyEditors\PropertyValueConvertersResolver.cs" />
     <Compile Include="PropertyEditors\RegexValidator.cs" />
     <Compile Include="PropertyEditors\RequiredManifestValueValidator.cs" />