Index: DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs
===================================================================
diff -u -r6888 -r6892
--- DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs	(.../DamPlugin.cs)	(revision 6888)
+++ DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs	(.../DamPlugin.cs)	(revision 6892)
@@ -31,7 +31,6 @@
 using Deltares.Dam.Data;
 using Deltares.Dam.Data.DamEngineIo;
 using Deltares.Dam.Data.DataPlugins.Configuration;
-using Deltares.Dam.Data.IO;
 using Deltares.Dam.Data.License;
 using Deltares.Dam.Data.Sensors;
 using Deltares.Dam.Data.UISupport;
@@ -50,7 +49,6 @@
 using Deltares.Standard.Forms;
 using Deltares.Standard.Forms.DExpress;
 using Deltares.Standard.Forms.Maps;
-using Deltares.Standard.IO.Xml;
 using Deltares.Standard.Language;
 using Deltares.Standard.Logging;
 using Deltares.Standard.Specifications;
@@ -87,13 +85,6 @@
             HideUnusedColumns = true
         };
 
-        private readonly GridViewControl calculationsControl = new GridViewControl
-        {
-            Name = "Calculations",
-            ShowToolbar = true,
-            HideUnusedColumns = true
-        };
-
         private readonly GridViewControl designCalculationsControl = new GridViewControl
         {
             Name = "DesignCalculations",
@@ -270,8 +261,6 @@
 
             lastDesignResult = null;
 
-            // Read the Waterlevel Timeseries
-            damProject.ImportWaterLevelTimeSeries();
             // Find the view|Image menu option
             BarItemLink imagesItem = mainForm.ViewMenu.ItemLinks.First(bi => bi.Item.Name.Equals("ImageMenu"));
             if (projectData.DamProjectType == DamProjectType.DamLiveConfiguration)
@@ -727,7 +716,10 @@
                 mainForm.Invoke(new PublisherDelegate(DataEventPublisher.DataListModified), LogManager.Messages, null);
             }
 
-            SetProperControlsAfterDesignCalculation();
+            if (damProject.DamProjectData.DamProjectType == DamProjectType.Design)
+            {
+                SetProperControlsAfterDesignCalculation();
+            }
         }
 
         private void SetProperControlsAfterDesignCalculation()
@@ -846,18 +838,6 @@
                     }
                 }
             }
-            else if (sender == damProject.DamProjectData.Dike)
-            {
-                try
-                {
-                    damProject.ImportWaterLevelTimeSeries();
-                    //locationJobSymbol.Update(damProject.DamProjectData.LocationJobs);
-                }
-                catch (TimeSerieSchemaValidationException exception)
-                {
-                    LocalizedMessageBox.ShowError(this, exception.Message);
-                }
-            }
             else if (sender == currentLocationJob && sender != null)
             {
                 DataEventPublisher.AfterChange(this, "CurrentLocationJob");