Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Data/HydraulicBoundaryLocation.cs
===================================================================
diff -u -r3ba0c50f3a3548264d60e9f347079d0586c53f28 -r80f41e842173e15c34c76faa14385b596e7ee34f
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Data/HydraulicBoundaryLocation.cs	(.../HydraulicBoundaryLocation.cs)	(revision 3ba0c50f3a3548264d60e9f347079d0586c53f28)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Data/HydraulicBoundaryLocation.cs	(.../HydraulicBoundaryLocation.cs)	(revision 80f41e842173e15c34c76faa14385b596e7ee34f)
@@ -26,7 +26,8 @@
     public class HydraulicBoundaryLocation
     {
         /// <summary>
-        /// Creates a new instance ofL <see cref="HydraulicBoundaryLocation"/>, with the given <paramref name="id"/>, <paramref name="name"/>, <paramref name="x"/>, and <paramref name="y"/>.
+        /// Creates a new instance ofL <see cref="HydraulicBoundaryLocation"/>, 
+        /// with the given <paramref name="id"/>, <paramref name="name"/>, <paramref name="x"/>, and <paramref name="y"/>.
         /// </summary>
         public HydraulicBoundaryLocation(long id, string name, double x, double y)
         {
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -rba0fafced29341fe0cb4d05330db1ef728597650 -r80f41e842173e15c34c76faa14385b596e7ee34f
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision ba0fafced29341fe0cb4d05330db1ef728597650)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 80f41e842173e15c34c76faa14385b596e7ee34f)
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//     Runtime Version:4.0.30319.17929
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -61,7 +61,7 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Alle berekeningen verwijderen?.
+        ///   Looks up a localized string similar to Wilt u alle toetspeil berekening uitvoer verwijderen?.
         /// </summary>
         public static string Delete_DesignWaterLevel_Calculations_Text {
             get {
@@ -70,15 +70,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Wil je alle toetspeil berekeningen verwijderen?.
-        /// </summary>
-        public static string Delete_DesignWaterLevel_Calculations_Title {
-            get {
-                return ResourceManager.GetString("Delete_DesignWaterLevel_Calculations_Title", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Toetspeilen berekenen.
         /// </summary>
         public static string DesignWaterLevel_Calculate {
@@ -97,7 +88,7 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Alle toetspeil berekeningen zijn verwijderd..
+        ///   Looks up a localized string similar to Alle toetspeil berekening uitvoeren zijn verwijderd..
         /// </summary>
         public static string DesignWaterLevel_Calculations_Deleted {
             get {
@@ -115,7 +106,7 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Koppel aan database.
+        ///   Looks up a localized string similar to Koppel aan database....
         /// </summary>
         public static string HydraulicBoundaryDatabase_Connect {
             get {
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Forms/Properties/Resources.resx
===================================================================
diff -u -rba0fafced29341fe0cb4d05330db1ef728597650 -r80f41e842173e15c34c76faa14385b596e7ee34f
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision ba0fafced29341fe0cb4d05330db1ef728597650)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 80f41e842173e15c34c76faa14385b596e7ee34f)
@@ -130,11 +130,8 @@
     <value>Hydraulische randvoorwaarden</value>
   </data>
   <data name="Delete_DesignWaterLevel_Calculations_Text" xml:space="preserve">
-    <value>Alle berekeningen verwijderen?</value>
+    <value>Wilt u alle toetspeil berekening uitvoer verwijderen?</value>
   </data>
-  <data name="Delete_DesignWaterLevel_Calculations_Title" xml:space="preserve">
-    <value>Wil je alle toetspeil berekeningen verwijderen?</value>
-  </data>
   <data name="DesignWaterLevel_Calculate" xml:space="preserve">
     <value>Toetspeilen berekenen</value>
   </data>
@@ -145,7 +142,7 @@
     <value>Er is geen hydraulische randvoorwaarden database beschikbaar om de toetspeilen te berekenen.</value>
   </data>
   <data name="HydraulicBoundaryDatabase_Connect" xml:space="preserve">
-    <value>Koppel aan database</value>
+    <value>Koppel aan database...</value>
   </data>
   <data name="HydraulicBoundaryDatabase_Connect_ToolTip" xml:space="preserve">
     <value>Koppelen aan de hydraulische randvoorwaarden database</value>
@@ -166,6 +163,6 @@
     <value>Selecteer database</value>
   </data>
   <data name="DesignWaterLevel_Calculations_Deleted" xml:space="preserve">
-    <value>Alle toetspeil berekeningen zijn verwijderd.</value>
+    <value>Alle toetspeil berekening uitvoeren zijn verwijderd.</value>
   </data>
 </root>
\ No newline at end of file
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/Map/AssessmentSectionMapData.cs
===================================================================
diff -u -racbd08302b69fc06e5cade26def0dea4d35e3b92 -r80f41e842173e15c34c76faa14385b596e7ee34f
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/Map/AssessmentSectionMapData.cs	(.../AssessmentSectionMapData.cs)	(revision acbd08302b69fc06e5cade26def0dea4d35e3b92)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/Map/AssessmentSectionMapData.cs	(.../AssessmentSectionMapData.cs)	(revision 80f41e842173e15c34c76faa14385b596e7ee34f)
@@ -21,6 +21,7 @@
 
 using System;
 using System.Collections.Generic;
+using Core.Common.Base;
 using Core.Components.Gis.Data;
 
 namespace Ringtoets.Integration.Data.Map
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs
===================================================================
diff -u -racbd08302b69fc06e5cade26def0dea4d35e3b92 -r80f41e842173e15c34c76faa14385b596e7ee34f
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs	(.../RingtoetsGuiPlugin.cs)	(revision acbd08302b69fc06e5cade26def0dea4d35e3b92)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs	(.../RingtoetsGuiPlugin.cs)	(revision 80f41e842173e15c34c76faa14385b596e7ee34f)
@@ -31,7 +31,6 @@
 using Core.Common.Gui.Forms;
 using Core.Common.Gui.Plugin;
 using Core.Components.Gis.Data;
-using Core.Plugins.DotSpatial;
 using Core.Plugins.DotSpatial.Forms;
 using log4net;
 using Ringtoets.Common.Data;
@@ -51,6 +50,7 @@
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 using UtilsResources = Core.Common.Utils.Properties.Resources;
 using HydraringResources = Ringtoets.HydraRing.Forms.Properties.Resources;
+using BaseResources = Core.Common.Base.Properties.Resources;
 
 namespace Ringtoets.Integration.Plugin
 {
@@ -445,7 +445,7 @@
             var newVersion = hydraulicBoundaryLocationsImporter.Version;
 
             // Compare
-            if (!string.IsNullOrEmpty(currentVersion) && currentVersion != newVersion)
+            if (string.IsNullOrEmpty(currentVersion) || currentVersion != newVersion)
             {
                 // Show dialog
                 ShowCleanDialog(nodeData, hydraulicBoundaryLocationsImporter, selectedFile, newVersion);
@@ -460,12 +460,13 @@
                                             string filePath,
                                             string version)
         {
+
             var confirmation = MessageBox.Show(
                 HydraringResources.Delete_DesignWaterLevel_Calculations_Text,
-                HydraringResources.Delete_DesignWaterLevel_Calculations_Title,
-                MessageBoxButtons.YesNo);
+                BaseResources.Confirm,
+                MessageBoxButtons.OKCancel);
 
-            if (confirmation == DialogResult.Yes)
+            if (confirmation == DialogResult.OK)
             {
                 ClearCalculations(nodeData.BaseNode);
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Ringtoets.Integration.Plugin.Test.csproj
===================================================================
diff -u -racbd08302b69fc06e5cade26def0dea4d35e3b92 -r80f41e842173e15c34c76faa14385b596e7ee34f
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Ringtoets.Integration.Plugin.Test.csproj	(.../Ringtoets.Integration.Plugin.Test.csproj)	(revision acbd08302b69fc06e5cade26def0dea4d35e3b92)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Ringtoets.Integration.Plugin.Test.csproj	(.../Ringtoets.Integration.Plugin.Test.csproj)	(revision 80f41e842173e15c34c76faa14385b596e7ee34f)
@@ -85,10 +85,6 @@
       <Project>{30e4c2ae-719e-4d70-9fa9-668a9767fbfa}</Project>
       <Name>Core.Common.Gui</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Utils\Core.Common.Utils.csproj">
-      <Project>{f49bd8b2-332a-4c91-a196-8cce0a2c7d98}</Project>
-      <Name>Core.Common.Utils</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
       <Project>{d749ee4c-ce50-4c17-bf01-9a953028c126}</Project>
       <Name>Core.Common.TestUtil</Name>