Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r7676712daa085088f4d58fd0ac088d1e0f72d48c -r7d42e59aadbea2c27f2f6eb97640c5d8ecc56e1c
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 7676712daa085088f4d58fd0ac088d1e0f72d48c)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 7d42e59aadbea2c27f2f6eb97640c5d8ecc56e1c)
@@ -488,78 +488,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to De gemiddelde waarde van de lognormale verdeling..
-        /// </summary>
-        public static string LogNormalDistribution_Mean_Description {
-            get {
-                return ResourceManager.GetString("LogNormalDistribution_Mean_Description", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to De standaardafwijking van de lognormale verdeling..
-        /// </summary>
-        public static string LogNormalDistribution_StandardDeviation_Description {
-            get {
-                return ResourceManager.GetString("LogNormalDistribution_StandardDeviation_Description", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Het soort kansverdeling waarin deze parameter gedefinieerd wordt..
-        /// </summary>
-        public static string NormalDistribution_DestributionType_Description {
-            get {
-                return ResourceManager.GetString("NormalDistribution_DestributionType_Description", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Type verdeling.
-        /// </summary>
-        public static string NormalDistribution_DestributionType_DisplayName {
-            get {
-                return ResourceManager.GetString("NormalDistribution_DestributionType_DisplayName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to De gemiddelde waarde van de normale verdeling..
-        /// </summary>
-        public static string NormalDistribution_Mean_Description {
-            get {
-                return ResourceManager.GetString("NormalDistribution_Mean_Description", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Verwachtingswaarde.
-        /// </summary>
-        public static string NormalDistribution_Mean_DisplayName {
-            get {
-                return ResourceManager.GetString("NormalDistribution_Mean_DisplayName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to De standaardafwijking van de normale verdeling..
-        /// </summary>
-        public static string NormalDistribution_StandardDeviation_Description {
-            get {
-                return ResourceManager.GetString("NormalDistribution_StandardDeviation_Description", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Standaardafwijking.
-        /// </summary>
-        public static string NormalDistribution_StandardDeviation_DisplayName {
-            get {
-                return ResourceManager.GetString("NormalDistribution_StandardDeviation_DisplayName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Oriëntatie van de dijk..
         /// </summary>
         public static string Orientation_Description {
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.resx
===================================================================
diff -u -r7676712daa085088f4d58fd0ac088d1e0f72d48c -r7d42e59aadbea2c27f2f6eb97640c5d8ecc56e1c
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 7676712daa085088f4d58fd0ac088d1e0f72d48c)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 7d42e59aadbea2c27f2f6eb97640c5d8ecc56e1c)
@@ -250,36 +250,12 @@
   <data name="GrassCoverErosionInwardsInput_FrunupModelFactor_DisplayName" xml:space="preserve">
     <value>Modelfactor Frunup [-]</value>
   </data>
-  <data name="NormalDistribution_DestributionType_Description" xml:space="preserve">
-    <value>Het soort kansverdeling waarin deze parameter gedefinieerd wordt.</value>
-  </data>
-  <data name="NormalDistribution_DestributionType_DisplayName" xml:space="preserve">
-    <value>Type verdeling</value>
-  </data>
-  <data name="NormalDistribution_Mean_Description" xml:space="preserve">
-    <value>De gemiddelde waarde van de normale verdeling.</value>
-  </data>
-  <data name="NormalDistribution_Mean_DisplayName" xml:space="preserve">
-    <value>Verwachtingswaarde</value>
-  </data>
-  <data name="NormalDistribution_StandardDeviation_Description" xml:space="preserve">
-    <value>De standaardafwijking van de normale verdeling.</value>
-  </data>
-  <data name="NormalDistribution_StandardDeviation_DisplayName" xml:space="preserve">
-    <value>Standaardafwijking</value>
-  </data>
   <data name="CriticalFlowRate_Description" xml:space="preserve">
     <value>Kritisch overslagdebiet per strekkende meter.</value>
   </data>
   <data name="CriticalFlowRate_DisplayName" xml:space="preserve">
     <value>Kritisch overslagdebiet [m³/s/m]</value>
   </data>
-  <data name="LogNormalDistribution_Mean_Description" xml:space="preserve">
-    <value>De gemiddelde waarde van de lognormale verdeling.</value>
-  </data>
-  <data name="LogNormalDistribution_StandardDeviation_Description" xml:space="preserve">
-    <value>De standaardafwijking van de lognormale verdeling.</value>
-  </data>
   <data name="Categories_HydraulicData" xml:space="preserve">
     <value>Hydraulische gegevens</value>
   </data>
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresCalculation.cs
===================================================================
diff -u -re1157c221217ef3b5ade6034183a7da0e620eb05 -r7d42e59aadbea2c27f2f6eb97640c5d8ecc56e1c
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresCalculation.cs	(.../HeightStructuresCalculation.cs)	(revision e1157c221217ef3b5ade6034183a7da0e620eb05)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresCalculation.cs	(.../HeightStructuresCalculation.cs)	(revision 7d42e59aadbea2c27f2f6eb97640c5d8ecc56e1c)
@@ -69,7 +69,10 @@
             Output = null;
         }
 
-        public void ClearHydraulicBoundaryLocation() {}
+        public void ClearHydraulicBoundaryLocation()
+        {
+            InputParameters.HydraulicBoundaryLocation = null;
+        }
 
         public ICalculationInput GetObservableInput()
         {
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresInputContextProperties.cs
===================================================================
diff -u -re1157c221217ef3b5ade6034183a7da0e620eb05 -r7d42e59aadbea2c27f2f6eb97640c5d8ecc56e1c
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresInputContextProperties.cs	(.../HeightStructuresInputContextProperties.cs)	(revision e1157c221217ef3b5ade6034183a7da0e620eb05)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresInputContextProperties.cs	(.../HeightStructuresInputContextProperties.cs)	(revision 7d42e59aadbea2c27f2f6eb97640c5d8ecc56e1c)
@@ -220,6 +220,7 @@
             set
             {
                 data.WrappedData.FailureProbabilityOfStructureGivenErosion = (RoundedDouble) FromProbabilityFormat(value);
+                data.WrappedData.NotifyObservers();
             }
         }
 
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresCalculationTest.cs
===================================================================
diff -u -r63e64c82e06f820a466370a462394dc5396219e3 -r7d42e59aadbea2c27f2f6eb97640c5d8ecc56e1c
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresCalculationTest.cs	(.../HeightStructuresCalculationTest.cs)	(revision 63e64c82e06f820a466370a462394dc5396219e3)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresCalculationTest.cs	(.../HeightStructuresCalculationTest.cs)	(revision 7d42e59aadbea2c27f2f6eb97640c5d8ecc56e1c)
@@ -23,6 +23,7 @@
 using NUnit.Framework;
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.Probability;
+using Ringtoets.HydraRing.Data;
 
 namespace Ringtoets.HeightStructures.Data.Test
 {
@@ -116,6 +117,24 @@
             Assert.AreSame(calculation.Output, output);
         }
 
+        [Test]
+        public void ClearHydraulicBoundaryLocation_Always_SetHydraulicBoundaryLocationToNull()
+        {
+            // Setup
+            var calculation = new HeightStructuresCalculation();
+            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "test", 1.0, 2.0);
+            calculation.InputParameters.HydraulicBoundaryLocation = hydraulicBoundaryLocation;
+
+            // Precondition
+            Assert.AreSame(hydraulicBoundaryLocation, calculation.InputParameters.HydraulicBoundaryLocation);
+
+            // Call
+            calculation.ClearHydraulicBoundaryLocation();
+
+            // Assert
+            Assert.IsNull(calculation.InputParameters.HydraulicBoundaryLocation);
+        }
+
         private void AssertDemoInput(HeightStructuresInput inputParameters)
         {
             Assert.AreEqual(2, inputParameters.LevelOfCrestOfStructure.Mean.NumberOfDecimalPlaces);
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs
===================================================================
diff -u -re1157c221217ef3b5ade6034183a7da0e620eb05 -r7d42e59aadbea2c27f2f6eb97640c5d8ecc56e1c
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs	(.../HeightStructuresInputContextPropertiesTest.cs)	(revision e1157c221217ef3b5ade6034183a7da0e620eb05)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs	(.../HeightStructuresInputContextPropertiesTest.cs)	(revision 7d42e59aadbea2c27f2f6eb97640c5d8ecc56e1c)
@@ -32,6 +32,7 @@
 using Ringtoets.HeightStructures.Data;
 using Ringtoets.HeightStructures.Forms.PresentationObjects;
 using Ringtoets.HeightStructures.Forms.PropertyClasses;
+using Ringtoets.HydraRing.Data;
 using CoreCommonBasePropertiesResources = Core.Common.Base.Properties.Resources;
 
 namespace Ringtoets.HeightStructures.Forms.Test.PropertyClasses
@@ -140,10 +141,12 @@
         {
             // Setup
             var observerMock = mockRepository.StrictMock<IObserver>();
-            const int numberProperties = 2;
+            const int numberProperties = 3;
             observerMock.Expect(o => o.UpdateObserver()).Repeat.Times(numberProperties);
+            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, "name", 0.0, 1.1);
             var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
             var calculationMock = mockRepository.StrictMock<ICalculation>();
+
             mockRepository.ReplayAll();
 
             var failureMechanism = new HeightStructuresFailureMechanism();
@@ -157,16 +160,18 @@
             };
 
             var random = new Random(100);
-            var newModelFactorOvertoppingSuperCriticalFlowMean = new RoundedDouble(2, random.NextDouble());
             var newOrientationOfTheNormalOfTheStructure = new RoundedDouble(2, random.NextDouble());
+            var newFailureProbabilityOfStructureGivenErosion = "100";
 
             // Call
-            properties.ModelFactorOvertoppingSuperCriticalFlow.Mean = newModelFactorOvertoppingSuperCriticalFlowMean;
             properties.OrientationOfTheNormalOfTheStructure = newOrientationOfTheNormalOfTheStructure;
+            properties.FailureProbabilityOfStructureGivenErosion = newFailureProbabilityOfStructureGivenErosion;
+            properties.HydraulicBoundaryLocation = hydraulicBoundaryLocation;
 
             // Assert
-            Assert.AreEqual(newModelFactorOvertoppingSuperCriticalFlowMean, properties.ModelFactorOvertoppingSuperCriticalFlow.Mean);
             Assert.AreEqual(newOrientationOfTheNormalOfTheStructure, properties.OrientationOfTheNormalOfTheStructure);
+            Assert.AreEqual(string.Format("1/{0}", newFailureProbabilityOfStructureGivenErosion), properties.FailureProbabilityOfStructureGivenErosion);
+            Assert.AreSame(hydraulicBoundaryLocation, properties.HydraulicBoundaryLocation);
             mockRepository.VerifyAll();
         }