Fisheye: Tag ab0195c554a0abb5d15b06c995b696b97a61b3e9 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Utils/Aop/EventSettings.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag ab0195c554a0abb5d15b06c995b696b97a61b3e9 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Utils/Aop/ICustomNotifyCollectionChange.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag ab0195c554a0abb5d15b06c995b696b97a61b3e9 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Utils/Aop/Markers/NoNotifyCollectionChangeAttribute.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag ab0195c554a0abb5d15b06c995b696b97a61b3e9 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Utils/Aop/Markers/NoNotifyPropertyChangeAttribute.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/src/Core.Common.Utils/Collections/Generic/EventedList.cs
===================================================================
diff -u -rd54d9acff9c97067eef035b8545f12b523bb6dd7 -rab0195c554a0abb5d15b06c995b696b97a61b3e9
--- Core/Common/src/Core.Common.Utils/Collections/Generic/EventedList.cs	(.../EventedList.cs)	(revision d54d9acff9c97067eef035b8545f12b523bb6dd7)
+++ Core/Common/src/Core.Common.Utils/Collections/Generic/EventedList.cs	(.../EventedList.cs)	(revision ab0195c554a0abb5d15b06c995b696b97a61b3e9)
@@ -3,7 +3,6 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
-using Core.Common.Utils.Aop;
 using log4net;
 
 namespace Core.Common.Utils.Collections.Generic
@@ -417,11 +416,6 @@
         {
             if (CollectionChanging != null)
             {
-                if (EventSettings.EnableLogging)
-                {
-                    eventsLog.DebugFormat("CollectionChanging L>> '{0}[{1}]', item:{2}, index:{3}, action:{4} - BEGIN >>>>>>>>>>>>>>", "EventedList", typeof(T).Name, item, index, action);
-                }
-
                 var args = new NotifyCollectionChangingEventArgs(action, item, index, -1);
 
                 try
@@ -443,11 +437,6 @@
         {
             if (CollectionChanged != null)
             {
-                if (EventSettings.EnableLogging)
-                {
-                    eventsLog.DebugFormat("CollectionChanged L<< '{0}[{1}]', item:{2}, index:{3}, action:{4} - END <<<<<<<<<<<<<<", "EventedList", typeof(T).Name, item, index, action);
-                }
-
                 var args = new NotifyCollectionChangingEventArgs(action, item, index, -1)
                 {
                     OldItem = oldItem
@@ -461,19 +450,6 @@
             // forwards event to subscribers of the list
             if (CollectionChanging != null)
             {
-                if (EventSettings.EnableLogging)
-                {
-                    if (sender.GetType().Name.Contains("EventedList"))
-                    {
-                        var senderTypeName = sender.GetType().GetGenericArguments()[0].Name;
-                        eventsLog.DebugFormat("CollectionChanging L>> '{0}[{1}]' -> '{5}[{6}]', item:{2}, index:{3}, action:{4}", "EventedList", senderTypeName, e.Item, e.Index, e.Action, "EventedList", typeof(T).Name);
-                    }
-                    else
-                    {
-                        eventsLog.DebugFormat("CollectionChanging L>> '{0}[{1}]' -> '{5}[{6}]', item:{2}, index:{3}, action:{4}", sender, sender.GetType().Name, e.Item, e.Index, e.Action, "EventedList", typeof(T).Name);
-                    }
-                }
-
                 CollectionChanging(sender, e);
             }
         }
@@ -483,19 +459,6 @@
             // forwards event to subscribers of the list
             if (CollectionChanged != null)
             {
-                if (EventSettings.EnableLogging)
-                {
-                    if (sender.GetType().Name.Contains("EventedList"))
-                    {
-                        var senderTypeName = sender.GetType().GetGenericArguments()[0].Name;
-                        eventsLog.DebugFormat("CollectionChanged L<< '{0}[{1}]' -> '{5}[{6}]', item:{2}, index:{3}, action:{4}", "EventedList", senderTypeName, e.Item, e.Index, e.Action, "EventedList", typeof(T).Name);
-                    }
-                    else
-                    {
-                        eventsLog.DebugFormat("CollectionChanged L<< '{0}[{1}]' -> '{5}[{6}]', item:{2}, index:{3}, action:{4}", sender, sender.GetType().Name, e.Item, e.Index, e.Action, "EventedList", typeof(T).Name);
-                    }
-                }
-
                 CollectionChanged(sender, e);
             }
         }
@@ -505,11 +468,6 @@
             // forwards event to subscribers of the list
             if (PropertyChanging != null)
             {
-                if (EventSettings.EnableLogging)
-                {
-                    eventsLog.DebugFormat("PropertyChanging L>> '{0}.{1}': '{2}[{3}]' -> '{4}[{5}]'", sender.GetType().Name, e.PropertyName, sender, sender.GetType().Name, "EventedList", typeof(T).Name);
-                }
-
                 PropertyChanging(sender, e);
             }
         }
@@ -519,11 +477,6 @@
             // forwards event to subscribers of the list
             if (PropertyChanged != null)
             {
-                if (EventSettings.EnableLogging)
-                {
-                    eventsLog.DebugFormat("PropertyChanged L<< '{0}.{1}': '{2}[{3}]' -> '{4}[{5}]'", sender.GetType().Name, e.PropertyName, sender, sender.GetType().Name, "EventedList", typeof(T).Name);
-                }
-
                 PropertyChanged(sender, e);
             }
         }
@@ -537,11 +490,6 @@
             var notifyPropertyChange = item as INotifyPropertyChange;
             if (notifyPropertyChange != null)
             {
-//                if (((INotifyCollectionChange)this).HasParentIsCheckedInItems)
-//                {
-//                    EntityAttribute.UnsetParent(notifyPropertyChange);
-//                }
-
                 notifyPropertyChange.PropertyChanging -= Item_PropertyChangingDelegate;
                 notifyPropertyChange.PropertyChanged -= Item_PropertyChangedDelegate;
             }
@@ -568,11 +516,6 @@
             var notifyPropertyChange = item as INotifyPropertyChange;
             if (notifyPropertyChange != null)
             {
-//                if (((INotifyCollectionChange)this).HasParentIsCheckedInItems)
-//                {
-//                    EntityAttribute.SetParent(notifyPropertyChange);
-//                }
-
                 if (Item_PropertyChangedDelegate == null)
                 {
                     InitializeDelegates();
Index: Core/Common/src/Core.Common.Utils/Core.Common.Utils.csproj
===================================================================
diff -u -ra4acc4b43f7e9f0d8a6d5ec4e26ed46f325fb103 -rab0195c554a0abb5d15b06c995b696b97a61b3e9
--- Core/Common/src/Core.Common.Utils/Core.Common.Utils.csproj	(.../Core.Common.Utils.csproj)	(revision a4acc4b43f7e9f0d8a6d5ec4e26ed46f325fb103)
+++ Core/Common/src/Core.Common.Utils/Core.Common.Utils.csproj	(.../Core.Common.Utils.csproj)	(revision ab0195c554a0abb5d15b06c995b696b97a61b3e9)
@@ -116,10 +116,6 @@
     <Compile Include="..\..\..\..\Core\Common\src\Core.Common.Version\GlobalAssembly.cs">
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
-    <Compile Include="Aop\EventSettings.cs" />
-    <Compile Include="Aop\ICustomNotifyCollectionChange.cs" />
-    <Compile Include="Aop\Markers\NoNotifyCollectionChangeAttribute.cs" />
-    <Compile Include="Aop\Markers\NoNotifyPropertyChangeAttribute.cs" />
     <Compile Include="Aop\TraceDllImportCallsAttribute.cs" />
     <Compile Include="Comparer.cs" />
     <Compile Include="ComponentModel\DynamicEditorAttribute.cs" />
Index: Core/GIS/src/Core.GIS.SharpMap.Api/Layers/ILabelLayer.cs
===================================================================
diff -u -rce62e274ed578602f6e0d44f08d3729c46220363 -rab0195c554a0abb5d15b06c995b696b97a61b3e9
--- Core/GIS/src/Core.GIS.SharpMap.Api/Layers/ILabelLayer.cs	(.../ILabelLayer.cs)	(revision ce62e274ed578602f6e0d44f08d3729c46220363)
+++ Core/GIS/src/Core.GIS.SharpMap.Api/Layers/ILabelLayer.cs	(.../ILabelLayer.cs)	(revision ab0195c554a0abb5d15b06c995b696b97a61b3e9)
@@ -1,4 +1,3 @@
-using Core.Common.Utils.Aop.Markers;
 using Core.GIS.SharpMap.Api.Delegates;
 
 namespace Core.GIS.SharpMap.Api.Layers
@@ -30,7 +29,6 @@
         /// </remarks>
         GetLabelMethod LabelStringDelegate { get; set; }
 
-        [NoNotifyPropertyChange]
         ILayer Parent { get; set; }
     }
 }
\ No newline at end of file
Index: Core/Plugins/src/Core.Plugins.SharpMapGis/BackGroundMapLayer.cs
===================================================================
diff -u -rbd67946f192eeda84e18c1d2842b9f20e39dfaf8 -rab0195c554a0abb5d15b06c995b696b97a61b3e9
--- Core/Plugins/src/Core.Plugins.SharpMapGis/BackGroundMapLayer.cs	(.../BackGroundMapLayer.cs)	(revision bd67946f192eeda84e18c1d2842b9f20e39dfaf8)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis/BackGroundMapLayer.cs	(.../BackGroundMapLayer.cs)	(revision ab0195c554a0abb5d15b06c995b696b97a61b3e9)
@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.Linq;
-using Core.Common.Utils.Aop.Markers;
 using Core.Common.Utils.Collections;
 using Core.Common.Utils.Collections.Generic;
 using Core.GIS.SharpMap.Api.Layers;
@@ -33,7 +32,6 @@
             BackgroundMap = map;
         }
 
-        [NoNotifyCollectionChange]
         public override EventedList<ILayer> Layers
         {
             get
@@ -64,7 +62,6 @@
         /// <summary>
         /// Map used a basis for this grouplayer
         /// </summary>
-        [NoNotifyPropertyChange]
         public Map BackgroundMap
         {
             get