Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/WaterBoard.cs
===================================================================
diff -u -r6815 -r6823
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/WaterBoard.cs	(.../WaterBoard.cs)	(revision 6815)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/WaterBoard.cs	(.../WaterBoard.cs)	(revision 6823)
@@ -36,7 +36,6 @@
 public class WaterBoard : IVisibleEnabled, IDisposable
 {
     private readonly FeatureRepository backgroundRepository;
-    private IList<Dike> dikes;
     private List<Location> locations;
     private IList<BackgroundRepositoryFeature> featureList;
     private IList<Segment> segments;
@@ -45,7 +44,6 @@
 
     public WaterBoard()
     {
-        dikes = new List<Dike>();
         featureList = new List<BackgroundRepositoryFeature>();
         backgroundRepository = new FeatureRepository();
         segments = new List<Segment>();
@@ -75,12 +73,7 @@
     {
         get
         {
-            if (dike != null)
-            {
-                return dike;
-            }
-
-            return dikes.Count > 0 ? dikes[0] : null;
+            return dike;
         }
         set
         {
@@ -103,19 +96,6 @@
         }
     }
 
-    [Validate]
-    public virtual IList<Dike> Dikes
-    {
-        get
-        {
-            return dikes;
-        }
-        set
-        {
-            dikes = value;
-        }
-    }
-
     [XmlIgnore]
     [Browsable(false)]
     [ReadOnly(true)]
@@ -127,9 +107,9 @@
             if (locations == null)
             {
                 locations = new List<Location>();
-                foreach (Dike dike in Dikes)
+                if (Dike != null)
                 {
-                    locations.AddRange(dike.Locations);
+                    locations.AddRange(Dike.Locations);
                 }
             }
 
@@ -192,10 +172,7 @@
 
     public void Dispose()
     {
-        foreach (Dike dike in Dikes)
-        {
-            dike.Dispose();
-        }
+        Dike?.Dispose();
     }
 
     public bool IsVisible(string property)