Index: Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs
===================================================================
diff -u -rcb903e8cdb76e9733979fe508ee097107c022a28 -rea180de6e9f5ba1108b4ff3cf7bb7e57de72a37a
--- Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs	(.../AddNewDemoAssessmentSectionCommand.cs)	(revision cb903e8cdb76e9733979fe508ee097107c022a28)
+++ Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs	(.../AddNewDemoAssessmentSectionCommand.cs)	(revision ea180de6e9f5ba1108b4ff3cf7bb7e57de72a37a)
@@ -158,7 +158,7 @@
         {
             HeightStructuresFailureMechanism failureMechanism = demoAssessmentSection.HeightStructures;
 
-            var calculation = new HeightStructuresCalculation(failureMechanism.GeneralInput);
+            var calculation = new HeightStructuresCalculation();
             failureMechanism.CalculationsGroup.Children.Add(calculation);
             calculation.InputParameters.HydraulicBoundaryLocation = demoAssessmentSection.HydraulicBoundaryDatabase.Locations.First(hl => hl.Id == 1300001);
             calculation.InputParameters.NotifyObservers();
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresCalculation.cs
===================================================================
diff -u -r7f4ee0fa245a18426c81c11c8f9ea18e73e42d07 -rea180de6e9f5ba1108b4ff3cf7bb7e57de72a37a
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresCalculation.cs	(.../HeightStructuresCalculation.cs)	(revision 7f4ee0fa245a18426c81c11c8f9ea18e73e42d07)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresCalculation.cs	(.../HeightStructuresCalculation.cs)	(revision ea180de6e9f5ba1108b4ff3cf7bb7e57de72a37a)
@@ -19,7 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
 using Core.Common.Base;
 using Core.Common.Base.Data;
 using Ringtoets.Common.Data.Calculation;
@@ -36,10 +35,7 @@
         /// <summary>
         /// Creates a new instance of <see cref="HeightStructuresCalculation"/>.
         /// </summary>
-        /// <param name="generalInputParameters">General height structures calculation input parameters 
-        /// that apply to each calculation.</param>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="generalInputParameters"/> is <c>null</c>.</exception>
-        public HeightStructuresCalculation(GeneralHeightStructuresInput generalInputParameters)
+        public HeightStructuresCalculation()
         {
             InputParameters = new HeightStructuresInput();
             Name = Resources.HeightStructuresCalculation_DefaultName;
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresGuiPlugin.cs
===================================================================
diff -u -r7f4ee0fa245a18426c81c11c8f9ea18e73e42d07 -rea180de6e9f5ba1108b4ff3cf7bb7e57de72a37a
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresGuiPlugin.cs	(.../HeightStructuresGuiPlugin.cs)	(revision 7f4ee0fa245a18426c81c11c8f9ea18e73e42d07)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresGuiPlugin.cs	(.../HeightStructuresGuiPlugin.cs)	(revision ea180de6e9f5ba1108b4ff3cf7bb7e57de72a37a)
@@ -416,7 +416,7 @@
 
         private static void AddCalculation(HeightStructuresCalculationGroupContext context)
         {
-            var calculation = new HeightStructuresCalculation(context.FailureMechanism.GeneralInput)
+            var calculation = new HeightStructuresCalculation
             {
                 Name = NamingHelper.GetUniqueName(context.WrappedData.Children, HeightStructuresDataResources.HeightStructuresCalculation_DefaultName, c => c.Name)
             };
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresCalculationTest.cs
===================================================================
diff -u -rcb903e8cdb76e9733979fe508ee097107c022a28 -rea180de6e9f5ba1108b4ff3cf7bb7e57de72a37a
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresCalculationTest.cs	(.../HeightStructuresCalculationTest.cs)	(revision cb903e8cdb76e9733979fe508ee097107c022a28)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresCalculationTest.cs	(.../HeightStructuresCalculationTest.cs)	(revision ea180de6e9f5ba1108b4ff3cf7bb7e57de72a37a)
@@ -19,7 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
 using Core.Common.Base;
 using NUnit.Framework;
 using Ringtoets.Common.Data.Calculation;
@@ -31,24 +30,10 @@
     public class HeightStructuresCalculationTest
     {
         [Test]
-        public void Constructor_NullGeneralInput_ThrowsArgumentNullException()
-        {
-            // Call
-            TestDelegate test = () => new HeightStructuresCalculation(null);
-
-            // Assert
-            var exception = Assert.Throws<ArgumentNullException>(test);
-            Assert.AreEqual("generalInputParameters", exception.ParamName);
-        }
-
-        [Test]
         public void Constructor_DefaultPropertyValuesAreSet()
         {
-            // Setup
-            var generalInput = new GeneralHeightStructuresInput();
-
             // Call
-            var calculation = new HeightStructuresCalculation(generalInput);
+            var calculation = new HeightStructuresCalculation();
 
             // Assert
             Assert.IsInstanceOf<ICalculation>(calculation);
@@ -64,8 +49,7 @@
         public void ClearOutput_Always_SetsOutputToNull()
         {
             // Setup
-            var generalInput = new GeneralHeightStructuresInput();
-            var calculation = new HeightStructuresCalculation(generalInput)
+            var calculation = new HeightStructuresCalculation
             {
                 Output = new TestHeightStructuresOutput()
             };
@@ -81,8 +65,7 @@
         public void HasOutput_OutputNull_ReturnsFalse()
         {
             // Setup
-            var generalInput = new GeneralHeightStructuresInput();
-            var calculation = new HeightStructuresCalculation(generalInput)
+            var calculation = new HeightStructuresCalculation
             {
                 Output = null
             };
@@ -95,8 +78,7 @@
         public void HasOutput_OutputSet_ReturnsTrue()
         {
             // Setup
-            var generalInput = new GeneralHeightStructuresInput();
-            var calculation = new HeightStructuresCalculation(generalInput)
+            var calculation = new HeightStructuresCalculation
             {
                 Output = new TestHeightStructuresOutput()
             };
@@ -109,8 +91,7 @@
         public void GetObservableInput_Always_ReturnsInputParameters()
         {
             // Setup
-            var generalInput = new GeneralHeightStructuresInput();
-            var calculation = new HeightStructuresCalculation(generalInput);
+            var calculation = new HeightStructuresCalculation();
 
             // Call
             ICalculationInput input = calculation.GetObservableInput();
@@ -123,8 +104,7 @@
         public void GetObservableOutput_Always_ReturnsOutput()
         {
             // Setup
-            var generalInput = new GeneralHeightStructuresInput();
-            var calculation = new HeightStructuresCalculation(generalInput)
+            var calculation = new HeightStructuresCalculation
             {
                 Output = new TestHeightStructuresOutput()
             };
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismTest.cs
===================================================================
diff -u -rcb903e8cdb76e9733979fe508ee097107c022a28 -rea180de6e9f5ba1108b4ff3cf7bb7e57de72a37a
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismTest.cs	(.../HeightStructuresFailureMechanismTest.cs)	(revision cb903e8cdb76e9733979fe508ee097107c022a28)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismTest.cs	(.../HeightStructuresFailureMechanismTest.cs)	(revision ea180de6e9f5ba1108b4ff3cf7bb7e57de72a37a)
@@ -99,17 +99,16 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var generalInput = new GeneralHeightStructuresInput();
             var failureMechanism = new HeightStructuresFailureMechanism
             {
                 CalculationsGroup =
                 {
                     Children =
                     {
                         new CalculationGroup(),
-                        new HeightStructuresCalculation(generalInput),
+                        new HeightStructuresCalculation(),
                         mocks.StrictMock<ICalculation>(),
-                        new HeightStructuresCalculation(generalInput)
+                        new HeightStructuresCalculation()
                     }
                 }
             };
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PresentationObjects/HeightStructuresCalculationContextTest.cs
===================================================================
diff -u -rcb903e8cdb76e9733979fe508ee097107c022a28 -rea180de6e9f5ba1108b4ff3cf7bb7e57de72a37a
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PresentationObjects/HeightStructuresCalculationContextTest.cs	(.../HeightStructuresCalculationContextTest.cs)	(revision cb903e8cdb76e9733979fe508ee097107c022a28)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PresentationObjects/HeightStructuresCalculationContextTest.cs	(.../HeightStructuresCalculationContextTest.cs)	(revision ea180de6e9f5ba1108b4ff3cf7bb7e57de72a37a)
@@ -44,7 +44,7 @@
         {
             // Setup
             var failureMechanism = new HeightStructuresFailureMechanism();
-            var calculation = new HeightStructuresCalculation(failureMechanism.GeneralInput);
+            var calculation = new HeightStructuresCalculation();
             var assessmentSectionMock = mocksRepository.StrictMock<IAssessmentSection>();
             mocksRepository.ReplayAll();
 
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -rcb903e8cdb76e9733979fe508ee097107c022a28 -rea180de6e9f5ba1108b4ff3cf7bb7e57de72a37a
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationContextTreeNodeInfoTest.cs)	(revision cb903e8cdb76e9733979fe508ee097107c022a28)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationContextTreeNodeInfoTest.cs)	(revision ea180de6e9f5ba1108b4ff3cf7bb7e57de72a37a)
@@ -109,7 +109,7 @@
             mocks.ReplayAll();
 
             var failureMechanism = new HeightStructuresFailureMechanism();
-            var calculation = new HeightStructuresCalculation(failureMechanism.GeneralInput);
+            var calculation = new HeightStructuresCalculation();
             var calculationContext = new HeightStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock);
 
             // Call
@@ -139,7 +139,7 @@
             mocks.ReplayAll();
 
             var failureMechanism = new HeightStructuresFailureMechanism();
-            var calculation = new HeightStructuresCalculation(failureMechanism.GeneralInput)
+            var calculation = new HeightStructuresCalculation
             {
                 Output = new TestHeightStructuresOutput()
             };
@@ -174,7 +174,7 @@
             var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
             var failureMechanism = new HeightStructuresFailureMechanism();
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
-            var calculation = new HeightStructuresCalculation(failureMechanism.GeneralInput);
+            var calculation = new HeightStructuresCalculation();
             var nodeData = new HeightStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock);
             var menuBuilderMock = mocks.StrictMock<IContextMenuBuilder>();
 
@@ -213,7 +213,7 @@
             var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
             var failureMechanism = new HeightStructuresFailureMechanism();
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
-            var calculation = new HeightStructuresCalculation(failureMechanism.GeneralInput);
+            var calculation = new HeightStructuresCalculation();
             var nodeData = new HeightStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock);
             var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
 
@@ -251,7 +251,7 @@
             var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
             var failureMechanism = new HeightStructuresFailureMechanism();
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
-            var calculation = new HeightStructuresCalculation(new GeneralHeightStructuresInput());
+            var calculation = new HeightStructuresCalculation();
 
             var nodeData = new HeightStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock);
             var guiMock = mocks.StrictMock<IGui>();
@@ -290,7 +290,7 @@
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
             assessmentSectionMock.Expect(asm => asm.HydraulicBoundaryDatabase).Return(null);
 
-            var calculation = new HeightStructuresCalculation(new GeneralHeightStructuresInput());
+            var calculation = new HeightStructuresCalculation();
             var nodeData = new HeightStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock);
 
             guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControlMock)).Return(new CustomItemsOnlyContextMenuBuilder());
@@ -328,7 +328,7 @@
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
             assessmentSectionMock.Stub(asm => asm.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase());
 
-            var calculation = new HeightStructuresCalculation(new GeneralHeightStructuresInput());
+            var calculation = new HeightStructuresCalculation();
             var nodeData = new HeightStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock);
 
             guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControlMock)).Return(new CustomItemsOnlyContextMenuBuilder());
@@ -375,7 +375,7 @@
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
             assessmentSectionMock.Stub(asm => asm.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase);
 
-            var calculation = new HeightStructuresCalculation(new GeneralHeightStructuresInput());
+            var calculation = new HeightStructuresCalculation();
             var nodeData = new HeightStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock);
 
             guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControlMock)).Return(new CustomItemsOnlyContextMenuBuilder());
@@ -429,7 +429,7 @@
             {
                 HydraulicBoundaryDatabase = hydraulicBoundaryDatabase
             };
-            var calculation = new HeightStructuresCalculation(new GeneralHeightStructuresInput())
+            var calculation = new HeightStructuresCalculation
             {
                 Output = new ProbabilityAssessmentOutput(double.NaN, double.NaN, double.NaN, double.NaN, double.NaN),
                 InputParameters =
@@ -478,7 +478,7 @@
             // Setup
             var group = new CalculationGroup();
             var failureMechanism = new HeightStructuresFailureMechanism();
-            var elementToBeRemoved = new HeightStructuresCalculation(failureMechanism.GeneralInput);
+            var elementToBeRemoved = new HeightStructuresCalculation();
             var observerMock = mocks.StrictMock<IObserver>();
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
             var calculationContext = new HeightStructuresCalculationContext(elementToBeRemoved,
@@ -493,7 +493,7 @@
             mocks.ReplayAll();
 
             group.Children.Add(elementToBeRemoved);
-            group.Children.Add(new HeightStructuresCalculation(failureMechanism.GeneralInput));
+            group.Children.Add(new HeightStructuresCalculation());
             group.Attach(observerMock);
 
             // Precondition
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -rcb903e8cdb76e9733979fe508ee097107c022a28 -rea180de6e9f5ba1108b4ff3cf7bb7e57de72a37a
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision cb903e8cdb76e9733979fe508ee097107c022a28)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision ea180de6e9f5ba1108b4ff3cf7bb7e57de72a37a)
@@ -127,7 +127,7 @@
             var failureMechanism = new HeightStructuresFailureMechanism();
             var group = new CalculationGroup();
             var childGroup = new CalculationGroup();
-            var childCalculation = new HeightStructuresCalculation(failureMechanism.GeneralInput);
+            var childCalculation = new HeightStructuresCalculation();
 
             group.Children.Add(childGroup);
             group.Children.Add(calculationItemMock);
@@ -345,7 +345,7 @@
             {
                 Children =
                 {
-                    new HeightStructuresCalculation(new GeneralHeightStructuresInput())
+                    new HeightStructuresCalculation()
                 }
             };
 
@@ -386,7 +386,7 @@
             {
                 Children =
                 {
-                    new HeightStructuresCalculation(new GeneralHeightStructuresInput())
+                    new HeightStructuresCalculation()
                 }
             };
 
@@ -395,7 +395,7 @@
             {
                 new Point2D(0, 0)
             }));
-            failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation(new GeneralHeightStructuresInput()));
+            failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation());
 
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
             assessmentSectionMock.Stub(asm => asm.HydraulicBoundaryDatabase).Return(null);
@@ -438,7 +438,7 @@
             {
                 Children =
                 {
-                    new HeightStructuresCalculation(new GeneralHeightStructuresInput())
+                    new HeightStructuresCalculation()
                 }
             };
 
@@ -447,7 +447,7 @@
             {
                 new Point2D(0, 0)
             }));
-            failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation(new GeneralHeightStructuresInput()));
+            failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation());
 
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
             assessmentSectionMock.Stub(asm => asm.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase());
@@ -491,7 +491,7 @@
             {
                 Children =
                 {
-                    new HeightStructuresCalculation(new GeneralHeightStructuresInput())
+                    new HeightStructuresCalculation()
                 }
             };
 
@@ -508,7 +508,7 @@
             {
                 new Point2D(0, 0)
             }));
-            failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation(new GeneralHeightStructuresInput()));
+            failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation());
 
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
             assessmentSectionMock.Stub(asm => asm.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase);
@@ -556,7 +556,7 @@
                 new Point2D(0, 0)
             }));
 
-            failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation(new GeneralHeightStructuresInput())
+            failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation
             {
                 Name = "A",
                 InputParameters =
@@ -565,7 +565,7 @@
                 }
             });
 
-            failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation(new GeneralHeightStructuresInput())
+            failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation
             {
                 Name = "B",
                 InputParameters =
@@ -670,7 +670,7 @@
             var nodeData = new HeightStructuresCalculationGroupContext(group,
                                                                        failureMechanism,
                                                                        assessmentSectionMock);
-            var calculation = new HeightStructuresCalculation(failureMechanism.GeneralInput)
+            var calculation = new HeightStructuresCalculation
             {
                 Name = "Nieuwe berekening"
             };
@@ -752,7 +752,7 @@
             var parentNodeData = new HeightStructuresCalculationGroupContext(parentGroup,
                                                                              failureMechanism,
                                                                              assessmentSectionMock);
-            var calculation = new HeightStructuresCalculation(failureMechanism.GeneralInput);
+            var calculation = new HeightStructuresCalculation();
 
             observerMock.Expect(o => o.UpdateObserver());
 
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -rcb903e8cdb76e9733979fe508ee097107c022a28 -rea180de6e9f5ba1108b4ff3cf7bb7e57de72a37a
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision cb903e8cdb76e9733979fe508ee097107c022a28)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision ea180de6e9f5ba1108b4ff3cf7bb7e57de72a37a)
@@ -377,7 +377,7 @@
             // Setup
             var guiMock = mocksRepository.StrictMock<IGui>();
             var failureMechanism = new HeightStructuresFailureMechanism();
-            failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation(new GeneralHeightStructuresInput()));
+            failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation());
             var assessmentSectionMock = mocksRepository.StrictMock<IAssessmentSection>();
 
             var nodeData = new HeightStructuresFailureMechanismContext(failureMechanism, assessmentSectionMock);
@@ -413,7 +413,7 @@
             {
                 new Point2D(0, 0)
             }));
-            failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation(new GeneralHeightStructuresInput()));
+            failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation());
 
             var assessmentSectionMock = mocksRepository.StrictMock<IAssessmentSection>();
             assessmentSectionMock.Expect(asm => asm.HydraulicBoundaryDatabase).Return(null);
@@ -451,7 +451,7 @@
             {
                 new Point2D(0, 0)
             }));
-            failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation(new GeneralHeightStructuresInput()));
+            failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation());
 
             var assessmentSectionMock = mocksRepository.StrictMock<IAssessmentSection>();
             assessmentSectionMock.Stub(asm => asm.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase());
@@ -491,7 +491,7 @@
             {
                 new Point2D(0, 0)
             }));
-            failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation(new GeneralHeightStructuresInput()));
+            failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation());
 
             string validFilePath = Path.Combine(testDataPath, "complete.sqlite");
 
@@ -543,15 +543,15 @@
             });
             failureMechanism.AddSection(section);
 
-            failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation(new GeneralHeightStructuresInput())
+            failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation
             {
                 Name = "A",
                 InputParameters =
                 {
                     HydraulicBoundaryLocation = new HydraulicBoundaryLocation(-1, "nonExisting", 1, 2)
                 }
             });
-            failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation(new GeneralHeightStructuresInput())
+            failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation
             {
                 Name = "B",
                 InputParameters =
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresInputContextTreeNodeInfoTest.cs
===================================================================
diff -u -r7f4ee0fa245a18426c81c11c8f9ea18e73e42d07 -rea180de6e9f5ba1108b4ff3cf7bb7e57de72a37a
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresInputContextTreeNodeInfoTest.cs	(.../HeightStructuresInputContextTreeNodeInfoTest.cs)	(revision 7f4ee0fa245a18426c81c11c8f9ea18e73e42d07)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresInputContextTreeNodeInfoTest.cs	(.../HeightStructuresInputContextTreeNodeInfoTest.cs)	(revision ea180de6e9f5ba1108b4ff3cf7bb7e57de72a37a)
@@ -78,11 +78,10 @@
         public void Text_Always_ReturnsTextFromResource()
         {
             // Setup
-            var generalInput = new GeneralHeightStructuresInput();
             var assessmentSectionMock = mocksRepository.StrictMock<IAssessmentSection>();
             var heightStructuresInputContext = new HeightStructuresInputContext(
                 new HeightStructuresInput(),
-                new HeightStructuresCalculation(generalInput),
+                new HeightStructuresCalculation(),
                 new HeightStructuresFailureMechanism(),
                 assessmentSectionMock);
 
@@ -101,10 +100,9 @@
         {
             // Setup
             var assessmentSectionMock = mocksRepository.StrictMock<IAssessmentSection>();
-            var generalInput = new GeneralHeightStructuresInput();
             var heightStructuresInputContext = new HeightStructuresInputContext(
                 new HeightStructuresInput(),
-                new HeightStructuresCalculation(generalInput),
+                new HeightStructuresCalculation(),
                 new HeightStructuresFailureMechanism(),
                 assessmentSectionMock);