Index: Core/Common/src/Core.Common.Utils/Collections/NotifyCollectionChangeAction.cs
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -rff56cdbfb6ad79edcdc0e9539254857b22c78920
--- Core/Common/src/Core.Common.Utils/Collections/NotifyCollectionChangeAction.cs	(.../NotifyCollectionChangeAction.cs)	(revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Core/Common/src/Core.Common.Utils/Collections/NotifyCollectionChangeAction.cs	(.../NotifyCollectionChangeAction.cs)	(revision ff56cdbfb6ad79edcdc0e9539254857b22c78920)
@@ -8,6 +8,6 @@
         Add,
         Remove,
         Replace,
-        Reset // HACK, TODO: remove this, used only in filtered Functions, move to a separate event in filtered function
+        Reset
     }
 }
\ No newline at end of file
Index: Core/Common/src/Core.Common.Utils/Collections/NotifyCollectionChangedEventHandler.cs
===================================================================
diff -u -r40a3475dedb6ce5aacbd38a6d7b8445665fb98cd -rff56cdbfb6ad79edcdc0e9539254857b22c78920
--- Core/Common/src/Core.Common.Utils/Collections/NotifyCollectionChangedEventHandler.cs	(.../NotifyCollectionChangedEventHandler.cs)	(revision 40a3475dedb6ce5aacbd38a6d7b8445665fb98cd)
+++ Core/Common/src/Core.Common.Utils/Collections/NotifyCollectionChangedEventHandler.cs	(.../NotifyCollectionChangedEventHandler.cs)	(revision ff56cdbfb6ad79edcdc0e9539254857b22c78920)
@@ -1,5 +1,4 @@
 namespace Core.Common.Utils.Collections
 {
-    // TODO: use NotifyCollectionChangeEventArgs as in PropertyChange
     public delegate void NotifyCollectionChangedEventHandler(object sender, NotifyCollectionChangeEventArgs e);
 }
\ No newline at end of file
Index: Core/Common/src/Core.Common.Utils/Core.Common.Utils.csproj
===================================================================
diff -u -r40a3475dedb6ce5aacbd38a6d7b8445665fb98cd -rff56cdbfb6ad79edcdc0e9539254857b22c78920
--- Core/Common/src/Core.Common.Utils/Core.Common.Utils.csproj	(.../Core.Common.Utils.csproj)	(revision 40a3475dedb6ce5aacbd38a6d7b8445665fb98cd)
+++ Core/Common/src/Core.Common.Utils/Core.Common.Utils.csproj	(.../Core.Common.Utils.csproj)	(revision ff56cdbfb6ad79edcdc0e9539254857b22c78920)
@@ -107,7 +107,6 @@
     <Compile Include="Collections\INotifyCollectionChanged.cs" />
     <Compile Include="Collections\NotifyCollectionChangeAction.cs" />
     <Compile Include="Collections\NotifyCollectionChangedEventHandler.cs" />
-    <Compile Include="INotifyPropertyChange.cs" />
     <Compile Include="Collections\CollectionExtensions.cs" />
     <Compile Include="Collections\EnumerableExtensions.cs" />
     <Compile Include="Collections\NotifyCollectionChangeEventArgs.cs" />
Fisheye: Tag ff56cdbfb6ad79edcdc0e9539254857b22c78920 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Utils/INotifyPropertyChange.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/test/Core.Common.Utils.Test/PropertyBag/DynamicPropertyBagTest.cs
===================================================================
diff -u -r636f3e171b2d423e6716bed09cb241de68ea8a6a -rff56cdbfb6ad79edcdc0e9539254857b22c78920
--- Core/Common/test/Core.Common.Utils.Test/PropertyBag/DynamicPropertyBagTest.cs	(.../DynamicPropertyBagTest.cs)	(revision 636f3e171b2d423e6716bed09cb241de68ea8a6a)
+++ Core/Common/test/Core.Common.Utils.Test/PropertyBag/DynamicPropertyBagTest.cs	(.../DynamicPropertyBagTest.cs)	(revision ff56cdbfb6ad79edcdc0e9539254857b22c78920)
@@ -270,15 +270,8 @@
             public string PropTwo { get; set; }
         }
 
-        private class TestProperties : INotifyPropertyChange
+        private class TestProperties
         {
-            public event PropertyChangedEventHandler PropertyChanged;
-// Required by interface, but not used (yet)
-#pragma warning disable 67
-            public event PropertyChangingEventHandler PropertyChanging;
-#pragma warning restore 67
-            private bool isNameReadOnly;
-
             public TestProperties()
             {
                 Name = "my name";
@@ -295,23 +288,8 @@
             [CategoryComponentModelAttribute("General")]
             public string Name { get; set; }
 
-            public bool IsNameReadOnly
-            {
-                get
-                {
-                    return isNameReadOnly;
-                }
-                set
-                {
-                    isNameReadOnly = value;
+            public bool IsNameReadOnly { get; set; }
 
-                    if (PropertyChanged != null)
-                    {
-                        PropertyChanged(this, new PropertyChangedEventArgs("IsNameReadOnly"));
-                    }
-                }
-            }
-
             public bool Visible { get; set; }
 
             [ReadOnly(true)] //one static property
Index: Core/GIS/src/Core.GIS.SharpMap.Api/Core.GIS.SharpMap.Api.csproj
===================================================================
diff -u -r40a3475dedb6ce5aacbd38a6d7b8445665fb98cd -rff56cdbfb6ad79edcdc0e9539254857b22c78920
--- Core/GIS/src/Core.GIS.SharpMap.Api/Core.GIS.SharpMap.Api.csproj	(.../Core.GIS.SharpMap.Api.csproj)	(revision 40a3475dedb6ce5aacbd38a6d7b8445665fb98cd)
+++ Core/GIS/src/Core.GIS.SharpMap.Api/Core.GIS.SharpMap.Api.csproj	(.../Core.GIS.SharpMap.Api.csproj)	(revision ff56cdbfb6ad79edcdc0e9539254857b22c78920)
@@ -64,6 +64,7 @@
     <Compile Include="IFeatureProvider.cs" />
     <Compile Include="Editors\IFeatureRelationInteractor.cs" />
     <Compile Include="IFeatureRenderer.cs" />
+    <Compile Include="INotifyPropertyChange.cs" />
     <Compile Include="Layers\IGroupLayer.cs" />
     <Compile Include="Layers\ILabelLayer.cs" />
     <Compile Include="Layers\ILabelStyle.cs" />
Index: Core/GIS/src/Core.GIS.SharpMap.Api/INotifyPropertyChange.cs
===================================================================
diff -u
--- Core/GIS/src/Core.GIS.SharpMap.Api/INotifyPropertyChange.cs	(revision 0)
+++ Core/GIS/src/Core.GIS.SharpMap.Api/INotifyPropertyChange.cs	(revision ff56cdbfb6ad79edcdc0e9539254857b22c78920)
@@ -0,0 +1,9 @@
+using System.ComponentModel;
+
+namespace Core.GIS.SharpMap.Api
+{
+    public interface INotifyPropertyChange : INotifyPropertyChanged, INotifyPropertyChanging
+    {
+
+    }
+}
\ No newline at end of file
Index: Core/GIS/src/Core.GIS.SharpMap.UI/Tools/Decorations/LayoutComponentTool.cs
===================================================================
diff -u -rcc4fe77af8a4c4a8c076fe19a9a7f3ee8fe7714c -rff56cdbfb6ad79edcdc0e9539254857b22c78920
--- Core/GIS/src/Core.GIS.SharpMap.UI/Tools/Decorations/LayoutComponentTool.cs	(.../LayoutComponentTool.cs)	(revision cc4fe77af8a4c4a8c076fe19a9a7f3ee8fe7714c)
+++ Core/GIS/src/Core.GIS.SharpMap.UI/Tools/Decorations/LayoutComponentTool.cs	(.../LayoutComponentTool.cs)	(revision ff56cdbfb6ad79edcdc0e9539254857b22c78920)
@@ -3,8 +3,8 @@
 using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
-using Core.Common.Utils;
 using Core.GIS.GeoAPI.Geometries;
+using Core.GIS.SharpMap.Api;
 
 namespace Core.GIS.SharpMap.UI.Tools.Decorations
 {
Index: Core/GIS/test/Core.GIS.SharpMap.Test/Collections/EventedListTest.cs
===================================================================
diff -u -r40a3475dedb6ce5aacbd38a6d7b8445665fb98cd -rff56cdbfb6ad79edcdc0e9539254857b22c78920
--- Core/GIS/test/Core.GIS.SharpMap.Test/Collections/EventedListTest.cs	(.../EventedListTest.cs)	(revision 40a3475dedb6ce5aacbd38a6d7b8445665fb98cd)
+++ Core/GIS/test/Core.GIS.SharpMap.Test/Collections/EventedListTest.cs	(.../EventedListTest.cs)	(revision ff56cdbfb6ad79edcdc0e9539254857b22c78920)
@@ -2,8 +2,8 @@
 using System.Linq;
 
 using Core.Common.TestUtil;
-using Core.Common.Utils;
 using Core.Common.Utils.Collections;
+using Core.GIS.SharpMap.Api;
 using Core.GIS.SharpMap.Api.Collections;
 
 using NUnit.Framework;
Index: Core/GIS/test/Core.GIS.SharpMap.Test/Data/Providers/FeatureCollectionTest.cs
===================================================================
diff -u -rb26409726de6dd5db534791e43885dd29b7b09b8 -rff56cdbfb6ad79edcdc0e9539254857b22c78920
--- Core/GIS/test/Core.GIS.SharpMap.Test/Data/Providers/FeatureCollectionTest.cs	(.../FeatureCollectionTest.cs)	(revision b26409726de6dd5db534791e43885dd29b7b09b8)
+++ Core/GIS/test/Core.GIS.SharpMap.Test/Data/Providers/FeatureCollectionTest.cs	(.../FeatureCollectionTest.cs)	(revision ff56cdbfb6ad79edcdc0e9539254857b22c78920)
@@ -1,11 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using Core.Common.Utils;
 using Core.GIS.GeoAPI.Extensions.Feature;
 using Core.GIS.GeoAPI.Geometries;
 using Core.GIS.NetTopologySuite.Extensions.Features;
 using Core.GIS.NetTopologySuite.Geometries;
+using Core.GIS.SharpMap.Api;
 using Core.GIS.SharpMap.Api.Collections;
 using Core.GIS.SharpMap.Data.Providers;
 using NUnit.Framework;