Index: src/Common/DelftTools.Shell.Core/IProjectItem.cs
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -rd505e5545e25721aee2dfb60bc2a27ab1878a0ad
--- src/Common/DelftTools.Shell.Core/IProjectItem.cs	(.../IProjectItem.cs)	(revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9)
+++ src/Common/DelftTools.Shell.Core/IProjectItem.cs	(.../IProjectItem.cs)	(revision d505e5545e25721aee2dfb60bc2a27ab1878a0ad)
@@ -1,5 +1,4 @@
 using DelftTools.Utils;
-using DelftTools.Utils.Data;
 
 namespace DelftTools.Shell.Core
 {
@@ -8,7 +7,7 @@
     /// TODO: remove IDeepCloneable, not all project items must be cloneable, also use ICloneable
     /// TODO: rename to IEntity and move to DelftTools.Utils, it has nothing to do with Folder
     ///</summary>
-    public interface IProjectItem : IUnique<long>, INameable, IDeepCloneable
+    public interface IProjectItem : INameable, IDeepCloneable
     {
     }
 }
\ No newline at end of file
Index: src/Common/DelftTools.Shell.Core/Workflow/Activity.cs
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -rd505e5545e25721aee2dfb60bc2a27ab1878a0ad
--- src/Common/DelftTools.Shell.Core/Workflow/Activity.cs	(.../Activity.cs)	(revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9)
+++ src/Common/DelftTools.Shell.Core/Workflow/Activity.cs	(.../Activity.cs)	(revision d505e5545e25721aee2dfb60bc2a27ab1878a0ad)
@@ -1,12 +1,11 @@
 using System;
 using System.Collections.Generic;
 using DelftTools.Utils.Collections.Generic;
-using DelftTools.Utils.Data;
 using log4net;
 
 namespace DelftTools.Shell.Core.Workflow
 {
-    public abstract class Activity : Unique<long>, IActivity
+    public abstract class Activity : IActivity
     {
         private static readonly ILog log = LogManager.GetLogger(typeof(Activity));
         private string progressText;
Index: src/Common/DelftTools.Shell.Gui/GuiContextManager.cs
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -rd505e5545e25721aee2dfb60bc2a27ab1878a0ad
--- src/Common/DelftTools.Shell.Gui/GuiContextManager.cs	(.../GuiContextManager.cs)	(revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9)
+++ src/Common/DelftTools.Shell.Gui/GuiContextManager.cs	(.../GuiContextManager.cs)	(revision d505e5545e25721aee2dfb60bc2a27ab1878a0ad)
@@ -1,6 +1,5 @@
 using DelftTools.Utils;
 using DelftTools.Utils.Aop;
-using DelftTools.Utils.Data;
 using log4net;
 
 namespace DelftTools.Shell.Gui
@@ -9,7 +8,7 @@
     /// TODO: separate manager from domain object
     ///</summary>
     [Entity(FireOnPropertyChange = false)]
-    public class GuiContextManager : Unique<long>, IManualCloneable
+    public class GuiContextManager : IManualCloneable
     {
         private static readonly ILog log = LogManager.GetLogger(typeof(GuiContextManager));
 
Index: src/Common/DelftTools.Utils/Data/EditableObjectUnique.cs
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -rd505e5545e25721aee2dfb60bc2a27ab1878a0ad
--- src/Common/DelftTools.Utils/Data/EditableObjectUnique.cs	(.../EditableObjectUnique.cs)	(revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9)
+++ src/Common/DelftTools.Utils/Data/EditableObjectUnique.cs	(.../EditableObjectUnique.cs)	(revision d505e5545e25721aee2dfb60bc2a27ab1878a0ad)
@@ -11,7 +11,7 @@
     /// <remarks>This IEditableObject implementation allows nested edit actions</remarks>
     /// <typeparam name="T"></typeparam>
     [Entity(FireOnCollectionChange = false)]
-    public abstract class EditableObjectUnique<T> : Unique<T>, IEditableObject
+    public abstract class EditableObjectUnique<T> : IEditableObject
     {
         private readonly Stack<IEditAction> editActions = new Stack<IEditAction>();
         private bool isEditing;
Fisheye: Tag d505e5545e25721aee2dfb60bc2a27ab1878a0ad refers to a dead (removed) revision in file `src/Common/DelftTools.Utils/Data/NameableEntity.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: src/Common/DelftTools.Utils/DelftTools.Utils.csproj
===================================================================
diff -u -r322d4b0df95dac67f7d5797dd9daf9ce9a19ea90 -rd505e5545e25721aee2dfb60bc2a27ab1878a0ad
--- src/Common/DelftTools.Utils/DelftTools.Utils.csproj	(.../DelftTools.Utils.csproj)	(revision 322d4b0df95dac67f7d5797dd9daf9ce9a19ea90)
+++ src/Common/DelftTools.Utils/DelftTools.Utils.csproj	(.../DelftTools.Utils.csproj)	(revision d505e5545e25721aee2dfb60bc2a27ab1878a0ad)
@@ -298,7 +298,6 @@
     <Compile Include="Threading\ThreadsafeBindingList.cs" />
     <Compile Include="Tuple.cs" />
     <Compile Include="TypeConverter.cs" />
-    <Compile Include="Data\NameableEntity.cs" />
     <Compile Include="Url.cs" />
     <Compile Include="Validation\IValidator.cs" />
     <Compile Include="Validation\ValidationHelper.cs" />
Index: src/Common/DelftTools.Utils/Url.cs
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -rd505e5545e25721aee2dfb60bc2a27ab1878a0ad
--- src/Common/DelftTools.Utils/Url.cs	(.../Url.cs)	(revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9)
+++ src/Common/DelftTools.Utils/Url.cs	(.../Url.cs)	(revision d505e5545e25721aee2dfb60bc2a27ab1878a0ad)
@@ -3,15 +3,14 @@
 using System.Xml.Schema;
 using System.Xml.Serialization;
 using DelftTools.Utils.Aop;
-using DelftTools.Utils.Data;
 
 namespace DelftTools.Utils
 {
     /// <summary>
     /// Web link, url.
     /// </summary>
     [Entity(FireOnCollectionChange = false)]
-    public class Url : Unique<long>, ICloneable, INameable, IXmlSerializable
+    public class Url : ICloneable, INameable, IXmlSerializable
     {
         private string path;
 
Index: src/Common/NetTopologySuite.Extensions/Features/Feature.cs
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -rd505e5545e25721aee2dfb60bc2a27ab1878a0ad
--- src/Common/NetTopologySuite.Extensions/Features/Feature.cs	(.../Feature.cs)	(revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9)
+++ src/Common/NetTopologySuite.Extensions/Features/Feature.cs	(.../Feature.cs)	(revision d505e5545e25721aee2dfb60bc2a27ab1878a0ad)
@@ -1,5 +1,3 @@
-using DelftTools.Utils.Data;
-
 using GeoAPI.Extensions.Feature;
 using GeoAPI.Geometries;
 
Index: src/Common/SharpMap.Api/IMap.cs
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -rd505e5545e25721aee2dfb60bc2a27ab1878a0ad
--- src/Common/SharpMap.Api/IMap.cs	(.../IMap.cs)	(revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9)
+++ src/Common/SharpMap.Api/IMap.cs	(.../IMap.cs)	(revision d505e5545e25721aee2dfb60bc2a27ab1878a0ad)
@@ -4,7 +4,6 @@
 using System.Drawing.Drawing2D;
 using DelftTools.Utils;
 using DelftTools.Utils.Collections.Generic;
-using DelftTools.Utils.Data;
 using GeoAPI.CoordinateSystems;
 using GeoAPI.Extensions.Feature;
 using GeoAPI.Geometries;
@@ -13,7 +12,7 @@
 
 namespace SharpMap.Api
 {
-    public interface IMap : IUnique<long>, INameable, ICloneable
+    public interface IMap : INameable, ICloneable
     {
         /// <summary>
         /// Event fired when the zoomlevel or the center point has been changed
Index: src/Common/SharpMap.Api/Layers/ILayer.cs
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -rd505e5545e25721aee2dfb60bc2a27ab1878a0ad
--- src/Common/SharpMap.Api/Layers/ILayer.cs	(.../ILayer.cs)	(revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9)
+++ src/Common/SharpMap.Api/Layers/ILayer.cs	(.../ILayer.cs)	(revision d505e5545e25721aee2dfb60bc2a27ab1878a0ad)
@@ -31,8 +31,6 @@
     /// </summary>
     public interface ILayer : ICloneable, IDisposable
     {
-        long Id { get; set; }
-
         /// <summary>
         /// Image of the layer for current map, layer uses it to render it's content to.
         /// Layer image contains only graphics rendered by one layer.
Index: src/Common/SharpMap/Data/Providers/DataTableFeatureProvider.cs
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -rd505e5545e25721aee2dfb60bc2a27ab1878a0ad
--- src/Common/SharpMap/Data/Providers/DataTableFeatureProvider.cs	(.../DataTableFeatureProvider.cs)	(revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9)
+++ src/Common/SharpMap/Data/Providers/DataTableFeatureProvider.cs	(.../DataTableFeatureProvider.cs)	(revision d505e5545e25721aee2dfb60bc2a27ab1878a0ad)
@@ -447,41 +447,4 @@
 
         #endregion
     }
-    public class WrapperFeature : Unique<long>, IFeature
-    {
-        private IGeometry geometry;
-
-        public WrapperFeature(IGeometry geometry)
-        {
-            Geometry = geometry;
-        }
-
-        #region IFeature Members
-
-        public IGeometry Geometry
-        {
-            get { return geometry; }
-            set { geometry = value; }
-        }
-        
-        public IFeatureAttributeCollection Attributes
-        {
-            get
-            {
-                throw new Exception("The method or operation is not implemented.");
-            }
-            set
-            {
-                throw new Exception("The method or operation is not implemented.");
-            }
-        }
-
-        #endregion
-
-        public object Clone()
-        {
-            throw new NotImplementedException();
-        }
-    }
-
 }
Index: src/Common/SharpMap/Layers/Layer.cs
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -rd505e5545e25721aee2dfb60bc2a27ab1878a0ad
--- src/Common/SharpMap/Layers/Layer.cs	(.../Layer.cs)	(revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9)
+++ src/Common/SharpMap/Layers/Layer.cs	(.../Layer.cs)	(revision d505e5545e25721aee2dfb60bc2a27ab1878a0ad)
@@ -23,7 +23,6 @@
 using System.Drawing.Imaging;
 using System.Linq;
 using DelftTools.Utils.Aop;
-using DelftTools.Utils.Data;
 using DelftTools.Utils.Diagnostics;
 using GeoAPI.CoordinateSystems;
 using GeoAPI.CoordinateSystems.Transformations;
@@ -48,7 +47,7 @@
     /// Implement this class instead of the ILayer interface to save a lot of common code.
     /// </summary>
     [Entity(FireOnCollectionChange = false)]
-    public abstract class Layer : Unique<long>, ILayer
+    public abstract class Layer : ILayer
     {
         private static readonly ILog log = LogManager.GetLogger(typeof(Layer));
 
Index: src/Common/SharpMap/Map/Map.cs
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -rd505e5545e25721aee2dfb60bc2a27ab1878a0ad
--- src/Common/SharpMap/Map/Map.cs	(.../Map.cs)	(revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9)
+++ src/Common/SharpMap/Map/Map.cs	(.../Map.cs)	(revision d505e5545e25721aee2dfb60bc2a27ab1878a0ad)
@@ -26,7 +26,6 @@
 using DelftTools.Utils.Aop;
 using DelftTools.Utils.Collections;
 using DelftTools.Utils.Collections.Generic;
-using DelftTools.Utils.Data;
 using DelftTools.Utils.Diagnostics;
 using GeoAPI.CoordinateSystems;
 using GeoAPI.Extensions.Feature;
@@ -82,7 +81,7 @@
     /// </example>
     [Entity(FireOnCollectionChange=false)]
     //[Serializable]
-    public class Map : Unique<long>, IDisposable, INotifyCollectionChange, IMap
+    public class Map : IDisposable, INotifyCollectionChange, IMap
     {
         private static readonly ILog log = LogManager.GetLogger(typeof(Map));
 
Index: src/DeltaShell/DeltaShell.Plugins.SharpMapGis.Gui/Forms/GeneratedMapLayerInfo.cs
===================================================================
diff -u -r18f9b18cab9da0c768badb3084415e993a5414ee -rd505e5545e25721aee2dfb60bc2a27ab1878a0ad
--- src/DeltaShell/DeltaShell.Plugins.SharpMapGis.Gui/Forms/GeneratedMapLayerInfo.cs	(.../GeneratedMapLayerInfo.cs)	(revision 18f9b18cab9da0c768badb3084415e993a5414ee)
+++ src/DeltaShell/DeltaShell.Plugins.SharpMapGis.Gui/Forms/GeneratedMapLayerInfo.cs	(.../GeneratedMapLayerInfo.cs)	(revision d505e5545e25721aee2dfb60bc2a27ab1878a0ad)
@@ -1,13 +1,12 @@
-using DelftTools.Utils.Data;
-using DelftTools.Utils.Reflection;
+using DelftTools.Utils.Reflection;
 using SharpMap.Api;
 using SharpMap.Api.Layers;
 using SharpMap.Layers;
 using SharpMap.Styles;
 
 namespace DeltaShell.Plugins.SharpMapGis.Gui.Forms
 {
-    public class GeneratedMapLayerInfo : Unique<long>
+    public class GeneratedMapLayerInfo
     {
         public GeneratedMapLayerInfo()
         {
Index: test/Common/DelftTools.Utils.Tests/DelftTools.Utils.Tests.csproj
===================================================================
diff -u -r3912a159ea7726b8b92966345440c2fff2b297e0 -rd505e5545e25721aee2dfb60bc2a27ab1878a0ad
--- test/Common/DelftTools.Utils.Tests/DelftTools.Utils.Tests.csproj	(.../DelftTools.Utils.Tests.csproj)	(revision 3912a159ea7726b8b92966345440c2fff2b297e0)
+++ test/Common/DelftTools.Utils.Tests/DelftTools.Utils.Tests.csproj	(.../DelftTools.Utils.Tests.csproj)	(revision d505e5545e25721aee2dfb60bc2a27ab1878a0ad)
@@ -198,7 +198,6 @@
     <Compile Include="TextDocumentTest.cs" />
     <Compile Include="Threading\ThreadedWorkerTest.cs" />
     <Compile Include="Threading\ThreadsafeBindingListTest.cs" />
-    <Compile Include="UniqueTest.cs" />
     <Compile Include="Validation\ValidationReportTest.cs" />
     <Compile Include="WeakEventHandlerTest.cs" />
     <Compile Include="Xml\Serialization\CustomSerializerTest.cs" />
Fisheye: Tag d505e5545e25721aee2dfb60bc2a27ab1878a0ad refers to a dead (removed) revision in file `test/Common/DelftTools.Utils.Tests/UniqueTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d505e5545e25721aee2dfb60bc2a27ab1878a0ad refers to a dead (removed) revision in file `test/Common/NetTopologySuite.Extensions.Tests/Features/SimpleFeature.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: test/Common/NetTopologySuite.Extensions.Tests/NetTopologySuite.Extensions.Tests.csproj
===================================================================
diff -u -r3912a159ea7726b8b92966345440c2fff2b297e0 -rd505e5545e25721aee2dfb60bc2a27ab1878a0ad
--- test/Common/NetTopologySuite.Extensions.Tests/NetTopologySuite.Extensions.Tests.csproj	(.../NetTopologySuite.Extensions.Tests.csproj)	(revision 3912a159ea7726b8b92966345440c2fff2b297e0)
+++ test/Common/NetTopologySuite.Extensions.Tests/NetTopologySuite.Extensions.Tests.csproj	(.../NetTopologySuite.Extensions.Tests.csproj)	(revision d505e5545e25721aee2dfb60bc2a27ab1878a0ad)
@@ -108,7 +108,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Features\FeatureAttributeAccessorHelperTest.cs" />
-    <Compile Include="Features\SimpleFeature.cs" />
     <Compile Include="Geometries\GeometryHelperTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="TestObjects\TestFeature.cs" />