Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresFailureMechanismProperties.cs
===================================================================
diff -u -r16d53fca2e51dcd5ede08bbebcda854c783ab025 -rae723c147c281ccbb2dd0b06c6f863c2d8d0403d
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresFailureMechanismProperties.cs	(.../HeightStructuresFailureMechanismProperties.cs)	(revision 16d53fca2e51dcd5ede08bbebcda854c783ab025)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresFailureMechanismProperties.cs	(.../HeightStructuresFailureMechanismProperties.cs)	(revision ae723c147c281ccbb2dd0b06c6f863c2d8d0403d)
@@ -20,9 +20,7 @@
 // All rights reserved.
 
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using Core.Common.Base;
 using Core.Common.Base.Data;
 using Core.Common.Gui.Attributes;
 using Core.Common.Gui.PropertyBag;
@@ -46,30 +44,20 @@
         private const int modelFactorOvertoppingFlowPropertyIndex = 6;
         private const int modelFactorStorageVolumePropertyIndex = 7;
 
-        private readonly IFailureMechanismPropertyChangeHandler<HeightStructuresFailureMechanism> propertyChangeHandler;
-
         /// <summary>
         /// Creates a new instance of <see cref="HeightStructuresFailureMechanismProperties"/>.
         /// </summary>
         /// <param name="data">The instance to show the properties of.</param>
-        /// <param name="handler">Handler responsible for handling effects of a property change.</param>
-        /// <exception cref="ArgumentNullException">Thrown when any input parameter is <c>null</c>.</exception>
-        public HeightStructuresFailureMechanismProperties(
-            HeightStructuresFailureMechanism data,
-            IFailureMechanismPropertyChangeHandler<HeightStructuresFailureMechanism> handler)
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="data"/>
+        /// is <c>null</c>.</exception>
+        public HeightStructuresFailureMechanismProperties(HeightStructuresFailureMechanism data)
         {
             if (data == null)
             {
                 throw new ArgumentNullException(nameof(data));
             }
 
-            if (handler == null)
-            {
-                throw new ArgumentNullException(nameof(handler));
-            }
-
             Data = data;
-            propertyChangeHandler = handler;
         }
 
         #region Length effect parameters
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs
===================================================================
diff -u -ra23cff5445d53b381fd72f50a0d9b6c200cbcd69 -rae723c147c281ccbb2dd0b06c6f863c2d8d0403d
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs	(.../HeightStructuresPlugin.cs)	(revision a23cff5445d53b381fd72f50a0d9b6c200cbcd69)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs	(.../HeightStructuresPlugin.cs)	(revision ae723c147c281ccbb2dd0b06c6f863c2d8d0403d)
@@ -71,9 +71,7 @@
         {
             yield return new PropertyInfo<HeightStructuresFailureMechanismContext, HeightStructuresFailureMechanismProperties>
             {
-                CreateInstance = context => new HeightStructuresFailureMechanismProperties(
-                    context.WrappedData,
-                    new FailureMechanismPropertyChangeHandler<HeightStructuresFailureMechanism>())
+                CreateInstance = context => new HeightStructuresFailureMechanismProperties(context.WrappedData)
             };
             yield return new PropertyInfo<HeightStructure, HeightStructureProperties>();
             yield return new PropertyInfo<HeightStructuresContext, StructureCollectionProperties<HeightStructure>>
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresFailureMechanismPropertiesTest.cs
===================================================================
diff -u -r16d53fca2e51dcd5ede08bbebcda854c783ab025 -rae723c147c281ccbb2dd0b06c6f863c2d8d0403d
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresFailureMechanismPropertiesTest.cs	(.../HeightStructuresFailureMechanismPropertiesTest.cs)	(revision 16d53fca2e51dcd5ede08bbebcda854c783ab025)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresFailureMechanismPropertiesTest.cs	(.../HeightStructuresFailureMechanismPropertiesTest.cs)	(revision ae723c147c281ccbb2dd0b06c6f863c2d8d0403d)
@@ -28,8 +28,6 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.TestUtil;
-using Ringtoets.Common.Forms.PropertyClasses;
-using Ringtoets.Common.Forms.TestUtil;
 using Ringtoets.HeightStructures.Data;
 using Ringtoets.HeightStructures.Forms.PropertyClasses;
 
@@ -47,52 +45,29 @@
         private const int modelFactorStorageVolumePropertyIndex = 6;
 
         [Test]
-        public void Constructor_DataIsNull_ThrowArgumentNullException()
+        public void Constructor_DataNull_ThrowArgumentNullException()
         {
-            // Setup
-            var mocks = new MockRepository();
-            var changeHandler = mocks.Stub<IFailureMechanismPropertyChangeHandler<HeightStructuresFailureMechanism>>();
-            mocks.ReplayAll();
-
             // Call
-            TestDelegate test = () => new HeightStructuresFailureMechanismProperties(null, changeHandler);
+            TestDelegate test = () => new HeightStructuresFailureMechanismProperties(null);
 
             // Assert
             string paramName = Assert.Throws<ArgumentNullException>(test).ParamName;
             Assert.AreEqual("data", paramName);
-            mocks.VerifyAll();
         }
 
         [Test]
-        public void Constructor_ChangeHandlerIsNull_ThrowArgumentNullException()
-        {
-            // Call
-            TestDelegate test = () => new HeightStructuresFailureMechanismProperties(
-                new HeightStructuresFailureMechanism(),
-                null);
-
-            // Assert
-            string paramName = Assert.Throws<ArgumentNullException>(test).ParamName;
-            Assert.AreEqual("handler", paramName);
-        }
-
-        [Test]
         [TestCase(true)]
         [TestCase(false)]
         public void Constructor_ValidValues_ExpectedValues(bool isRelevant)
         {
             // Setup
-            var mocks = new MockRepository();
-            var changeHandler = mocks.Stub<IFailureMechanismPropertyChangeHandler<HeightStructuresFailureMechanism>>();
-            mocks.ReplayAll();
-
             var failureMechanism = new HeightStructuresFailureMechanism
             {
                 IsRelevant = isRelevant
             };
 
             // Call
-            var properties = new HeightStructuresFailureMechanismProperties(failureMechanism, changeHandler);
+            var properties = new HeightStructuresFailureMechanismProperties(failureMechanism);
 
             // Assert
             Assert.IsInstanceOf<ObjectProperties<HeightStructuresFailureMechanism>>(properties);
@@ -110,25 +85,17 @@
 
             Assert.AreEqual(generalInput.ModelFactorStorageVolume.Mean, properties.ModelFactorStorageVolume.Mean);
             Assert.AreEqual(generalInput.ModelFactorStorageVolume.StandardDeviation, properties.ModelFactorStorageVolume.StandardDeviation);
-
-            mocks.VerifyAll();
         }
 
         [Test]
         public void Constructor_IsRelevantTrue_PropertiesHaveExpectedAttributesValues()
         {
-            // Setup
-            var mocks = new MockRepository();
-            var changeHandler = mocks.Stub<IFailureMechanismPropertyChangeHandler<HeightStructuresFailureMechanism>>();
-            mocks.ReplayAll();
-
             // Call
             var properties = new HeightStructuresFailureMechanismProperties(
                 new HeightStructuresFailureMechanism
                 {
                     IsRelevant = true
-                },
-                changeHandler);
+                });
 
             // Assert
             const string generalCategory = "Algemeen";
@@ -187,25 +154,17 @@
                                                                             "Modelfactor kombergend vermogen [-]",
                                                                             "Modelfactor kombergend vermogen.",
                                                                             true);
-
-            mocks.VerifyAll();
         }
 
         [Test]
         public void Constructor_IsRelevantFalse_PropertiesHaveExpectedAttributesValues()
         {
-            // Setup
-            var mocks = new MockRepository();
-            var changeHandler = mocks.Stub<IFailureMechanismPropertyChangeHandler<HeightStructuresFailureMechanism>>();
-            mocks.ReplayAll();
-
             // Call
             var properties = new HeightStructuresFailureMechanismProperties(
                 new HeightStructuresFailureMechanism
                 {
                     IsRelevant = false
-                },
-                changeHandler);
+                });
 
             // Assert
             const string generalCategory = "Algemeen";
@@ -233,8 +192,6 @@
                                                                             "Is relevant",
                                                                             "Geeft aan of dit toetsspoor relevant is of niet.",
                                                                             true);
-
-            mocks.VerifyAll();
         }
 
         [Test]
@@ -252,13 +209,8 @@
             var failureMechanism = new HeightStructuresFailureMechanism();
             failureMechanism.Attach(observer);
 
-            var changeHandler = new FailureMechanismSetPropertyValueAfterConfirmationParameterTester<HeightStructuresFailureMechanism, double>(
-                failureMechanism,
-                value,
-                new IObservable[0]);
+            var properties = new HeightStructuresFailureMechanismProperties(failureMechanism);
 
-            var properties = new HeightStructuresFailureMechanismProperties(failureMechanism, changeHandler);
-
             // Call
             TestDelegate test = () => properties.N = (RoundedDouble) value;
 
@@ -282,12 +234,8 @@
 
             var failureMechanism = new HeightStructuresFailureMechanism();
             failureMechanism.Attach(observer);
-            var changeHandler = new FailureMechanismSetPropertyValueAfterConfirmationParameterTester<HeightStructuresFailureMechanism, double>(
-                failureMechanism,
-                value,
-                new IObservable[0]);
 
-            var properties = new HeightStructuresFailureMechanismProperties(failureMechanism, changeHandler);
+            var properties = new HeightStructuresFailureMechanismProperties(failureMechanism);
 
             // Call
             properties.N = (RoundedDouble) value;
@@ -303,16 +251,11 @@
         public void DynamicVisibleValidationMethod_DependingOnRelevancy_ReturnExpectedVisibility(bool isRelevant)
         {
             // Setup
-            var mocks = new MockRepository();
-            var changeHandler = mocks.Stub<IFailureMechanismPropertyChangeHandler<HeightStructuresFailureMechanism>>();
-            mocks.ReplayAll();
-
             var properties = new HeightStructuresFailureMechanismProperties(
                 new HeightStructuresFailureMechanism
                 {
                     IsRelevant = isRelevant
-                },
-                changeHandler);
+                });
 
             // Call & Assert
             Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.Name)));
@@ -325,8 +268,6 @@
             Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.ModelFactorStorageVolume)));
 
             Assert.IsTrue(properties.DynamicVisibleValidationMethod(null));
-
-            mocks.VerifyAll();
         }
     }
 }
\ No newline at end of file