Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/GeneralHeightStructuresInput.cs
===================================================================
diff -u -r4bf59bb3506b840b284efe0c0f4431b7876e0e5b -r8036936a18ebe45fafa40d67a016424a32668391
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/GeneralHeightStructuresInput.cs	(.../GeneralHeightStructuresInput.cs)	(revision 4bf59bb3506b840b284efe0c0f4431b7876e0e5b)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/GeneralHeightStructuresInput.cs	(.../GeneralHeightStructuresInput.cs)	(revision 8036936a18ebe45fafa40d67a016424a32668391)
@@ -84,21 +84,21 @@
         /// Gets the gravitational acceleration.
         /// [m/s^2]
         /// </summary>
-        public RoundedDouble GravitationalAcceleration { get; private set; }
+        public RoundedDouble GravitationalAcceleration { get; }
 
         /// <summary>
         /// Gets the model factor overtopping flow.
         /// </summary>
-        public LogNormalDistribution ModelFactorOvertoppingFlow { get; private set; }
+        public LogNormalDistribution ModelFactorOvertoppingFlow { get; }
 
         /// <summary>
         /// Gets the model factor for storage volume.
         /// </summary>
-        public LogNormalDistribution ModelFactorStorageVolume { get; private set; }
+        public LogNormalDistribution ModelFactorStorageVolume { get; }
 
         /// <summary>
         /// Gets the model factor for incoming flow volume.
         /// </summary>
-        public RoundedDouble ModelFactorInflowVolume { get; private set; }
+        public RoundedDouble ModelFactorInflowVolume { get; }
     }
 }
\ No newline at end of file
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanism.cs
===================================================================
diff -u -rcda0b786ef4c81469fb4213e7fc82cb74493fcf9 -r8036936a18ebe45fafa40d67a016424a32668391
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanism.cs	(.../HeightStructuresFailureMechanism.cs)	(revision cda0b786ef4c81469fb4213e7fc82cb74493fcf9)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanism.cs	(.../HeightStructuresFailureMechanism.cs)	(revision 8036936a18ebe45fafa40d67a016424a32668391)
@@ -62,17 +62,17 @@
         /// <summary>
         /// Gets the height structures calculation input parameters that apply to each calculation.
         /// </summary>
-        public GeneralHeightStructuresInput GeneralInput { get; private set; }
+        public GeneralHeightStructuresInput GeneralInput { get; }
 
         /// <summary>
         /// Gets the available height structures of this instance.
         /// </summary>
-        public StructureCollection<HeightStructure> HeightStructures { get; private set; }
+        public StructureCollection<HeightStructure> HeightStructures { get; }
 
         /// <summary>
         /// Gets the available foreshore profiles for this instance.
         /// </summary>
-        public ForeshoreProfileCollection ForeshoreProfiles { get; private set; }
+        public ForeshoreProfileCollection ForeshoreProfiles { get; }
 
         /// <summary>
         /// Gets the container of all calculations.
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresInput.cs
===================================================================
diff -u -r2fa096726e41140ee4bfa477b5d23f3fc9ed4f65 -r8036936a18ebe45fafa40d67a016424a32668391
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresInput.cs	(.../HeightStructuresInput.cs)	(revision 2fa096726e41140ee4bfa477b5d23f3fc9ed4f65)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresInput.cs	(.../HeightStructuresInput.cs)	(revision 8036936a18ebe45fafa40d67a016424a32668391)
@@ -51,6 +51,22 @@
             SetDefaultSchematizationProperties();
         }
 
+        public override bool IsStructureInputSynchronized
+        {
+            get
+            {
+                return Structure != null
+                       && Equals(StructureNormalOrientation, Structure.StructureNormalOrientation)
+                       && Equals(LevelCrestStructure, Structure.LevelCrestStructure)
+                       && Equals(FlowWidthAtBottomProtection, Structure.FlowWidthAtBottomProtection)
+                       && Equals(CriticalOvertoppingDischarge, Structure.CriticalOvertoppingDischarge)
+                       && Equals(WidthFlowApertures, Structure.WidthFlowApertures)
+                       && Equals(FailureProbabilityStructureWithErosion, Structure.FailureProbabilityStructureWithErosion)
+                       && Equals(StorageStructureArea, Structure.StorageStructureArea)
+                       && Equals(AllowedLevelIncreaseStorage, Structure.AllowedLevelIncreaseStorage);
+            }
+        }
+
         #region Hydraulic data
 
         /// <summary>
@@ -107,22 +123,6 @@
             return clone;
         }
 
-        public override bool IsStructureInputSynchronized
-        {
-            get
-            {
-                return Structure != null
-                       && Equals(StructureNormalOrientation, Structure.StructureNormalOrientation)
-                       && Equals(LevelCrestStructure, Structure.LevelCrestStructure)
-                       && Equals(FlowWidthAtBottomProtection, Structure.FlowWidthAtBottomProtection)
-                       && Equals(CriticalOvertoppingDischarge, Structure.CriticalOvertoppingDischarge)
-                       && Equals(WidthFlowApertures, Structure.WidthFlowApertures)
-                       && Equals(FailureProbabilityStructureWithErosion, Structure.FailureProbabilityStructureWithErosion)
-                       && Equals(StorageStructureArea, Structure.StorageStructureArea)
-                       && Equals(AllowedLevelIncreaseStorage, Structure.AllowedLevelIncreaseStorage);
-            }
-        }
-
         public override void SynchronizeStructureInput()
         {
             if (Structure != null)
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PresentationObjects/HeightStructuresScenariosContext.cs
===================================================================
diff -u -r4bf59bb3506b840b284efe0c0f4431b7876e0e5b -r8036936a18ebe45fafa40d67a016424a32668391
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PresentationObjects/HeightStructuresScenariosContext.cs	(.../HeightStructuresScenariosContext.cs)	(revision 4bf59bb3506b840b284efe0c0f4431b7876e0e5b)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PresentationObjects/HeightStructuresScenariosContext.cs	(.../HeightStructuresScenariosContext.cs)	(revision 8036936a18ebe45fafa40d67a016424a32668391)
@@ -52,6 +52,6 @@
         /// <summary>
         /// The parent failure mechanism of the calculation group.
         /// </summary>
-        public HeightStructuresFailureMechanism ParentFailureMechanism { get; private set; }
+        public HeightStructuresFailureMechanism ParentFailureMechanism { get; }
     }
 }
\ No newline at end of file
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs
===================================================================
diff -u -r19f983eab8eac43d27e39f6eb9de019bad677652 -r8036936a18ebe45fafa40d67a016424a32668391
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs	(.../HeightStructuresCalculationService.cs)	(revision 19f983eab8eac43d27e39f6eb9de019bad677652)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs	(.../HeightStructuresCalculationService.cs)	(revision 8036936a18ebe45fafa40d67a016424a32668391)
@@ -19,7 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Service;
 using Ringtoets.Common.Service.Structures;
 using Ringtoets.HeightStructures.Data;
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/Ringtoets.HeightStructures.Service.csproj
===================================================================
diff -u -r461842cc9a0a60d00900065b9a7db474db7d7548 -r8036936a18ebe45fafa40d67a016424a32668391
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/Ringtoets.HeightStructures.Service.csproj	(.../Ringtoets.HeightStructures.Service.csproj)	(revision 461842cc9a0a60d00900065b9a7db474db7d7548)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/Ringtoets.HeightStructures.Service.csproj	(.../Ringtoets.HeightStructures.Service.csproj)	(revision 8036936a18ebe45fafa40d67a016424a32668391)
@@ -32,10 +32,6 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net, Version=1.2.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\log4net.2.0.4\lib\net40-full\log4net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
   </ItemGroup>
@@ -71,21 +67,11 @@
       <Name>Ringtoets.Common.Forms</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\Common\src\Ringtoets.Common.IO\Ringtoets.Common.IO.csproj">
-      <Project>{52BA7627-CBAB-4209-BE77-3B5F31378277}</Project>
-      <Name>Ringtoets.Common.IO</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Ringtoets.Common.Service\Ringtoets.Common.Service.csproj">
       <Project>{D951D6DA-FE83-4920-9FDB-63BF96480B54}</Project>
       <Name>Ringtoets.Common.Service</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\Common\src\Ringtoets.Common.Utils\Ringtoets.Common.Utils.csproj">
-      <Project>{6A074D65-A81C-4C1C-8E24-F36C916E4ED7}</Project>
-      <Name>Ringtoets.Common.Utils</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\HydraRing\src\Ringtoets.HydraRing.Calculation\Ringtoets.HydraRing.Calculation.csproj">
       <Project>{888D4097-8BC2-4703-9FB1-8744C94D525E}</Project>
       <Name>Ringtoets.HydraRing.Calculation</Name>
@@ -101,7 +87,6 @@
     <None Include="..\..\..\..\build\Copying.licenseheader">
       <Link>Copying.licenseheader</Link>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Properties\Resources.resx">
Fisheye: Tag 8036936a18ebe45fafa40d67a016424a32668391 refers to a dead (removed) revision in file `Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.TestUtil/HeightStructuresCloneAssert.cs
===================================================================
diff -u -r9cad3fcafde3778a0b39a89b1758af7d8a120735 -r8036936a18ebe45fafa40d67a016424a32668391
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.TestUtil/HeightStructuresCloneAssert.cs	(.../HeightStructuresCloneAssert.cs)	(revision 9cad3fcafde3778a0b39a89b1758af7d8a120735)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.TestUtil/HeightStructuresCloneAssert.cs	(.../HeightStructuresCloneAssert.cs)	(revision 8036936a18ebe45fafa40d67a016424a32668391)
@@ -46,4 +46,4 @@
             Assert.AreEqual(original.DeviationWaveDirection, clone.DeviationWaveDirection);
         }
     }
-}
+}
\ No newline at end of file
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PresentationObjects/HeightStructuresCalculationContextTest.cs
===================================================================
diff -u -r1135c8dff2d97eb3b8f17ada1f96bc068ac06bc2 -r8036936a18ebe45fafa40d67a016424a32668391
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PresentationObjects/HeightStructuresCalculationContextTest.cs	(.../HeightStructuresCalculationContextTest.cs)	(revision 1135c8dff2d97eb3b8f17ada1f96bc068ac06bc2)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PresentationObjects/HeightStructuresCalculationContextTest.cs	(.../HeightStructuresCalculationContextTest.cs)	(revision 8036936a18ebe45fafa40d67a016424a32668391)
@@ -82,10 +82,10 @@
         private class DerivedHeightStructuresCalculationContext : HeightStructuresCalculationContext
         {
             public DerivedHeightStructuresCalculationContext(StructuresCalculation<HeightStructuresInput> calculation,
-                                                                     CalculationGroup parent,
-                                                                     HeightStructuresFailureMechanism failureMechanism,
-                                                                     IAssessmentSection assessmentSection)
-                : base(calculation, parent, failureMechanism, assessmentSection) { }
+                                                             CalculationGroup parent,
+                                                             HeightStructuresFailureMechanism failureMechanism,
+                                                             IAssessmentSection assessmentSection)
+                : base(calculation, parent, failureMechanism, assessmentSection) {}
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -rdcc94dbcc481ef9f6f83308b82096f85f9cb6f01 -r8036936a18ebe45fafa40d67a016424a32668391
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationContextTreeNodeInfoTest.cs)	(revision dcc94dbcc481ef9f6f83308b82096f85f9cb6f01)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationContextTreeNodeInfoTest.cs)	(revision 8036936a18ebe45fafa40d67a016424a32668391)
@@ -38,7 +38,6 @@
 using Ringtoets.Common.Data;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Calculation;
-using Ringtoets.Common.Data.Contribution;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Data.Structures;
@@ -912,8 +911,13 @@
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             var failureMechanism = new TestHeightStructuresFailureMechanism();
             var parent = new CalculationGroup();
-            var calculation = new StructuresCalculation<HeightStructuresInput>();
-            calculation.InputParameters.ForeshoreProfile = new TestForeshoreProfile();
+            var calculation = new StructuresCalculation<HeightStructuresInput>
+            {
+                InputParameters =
+                {
+                    ForeshoreProfile = new TestForeshoreProfile()
+                }
+            };
 
             var nodeData = new HeightStructuresCalculationContext(calculation,
                                                                   parent,
@@ -953,8 +957,13 @@
 
             var foreshoreProfileInput = new TestForeshoreProfile();
             var parent = new CalculationGroup();
-            var calculation = new StructuresCalculation<HeightStructuresInput>();
-            calculation.InputParameters.ForeshoreProfile = foreshoreProfileInput;
+            var calculation = new StructuresCalculation<HeightStructuresInput>
+            {
+                InputParameters =
+                {
+                    ForeshoreProfile = foreshoreProfileInput
+                }
+            };
             TestForeshoreProfile.ChangeBreakWaterProperties(foreshoreProfileInput);
 
             var nodeData = new HeightStructuresCalculationContext(calculation,
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -rdcc94dbcc481ef9f6f83308b82096f85f9cb6f01 -r8036936a18ebe45fafa40d67a016424a32668391
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision dcc94dbcc481ef9f6f83308b82096f85f9cb6f01)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision 8036936a18ebe45fafa40d67a016424a32668391)
@@ -39,7 +39,6 @@
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Calculation;
-using Ringtoets.Common.Data.Contribution;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Data.Structures;
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -rdcc94dbcc481ef9f6f83308b82096f85f9cb6f01 -r8036936a18ebe45fafa40d67a016424a32668391
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision dcc94dbcc481ef9f6f83308b82096f85f9cb6f01)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision 8036936a18ebe45fafa40d67a016424a32668391)
@@ -36,8 +36,6 @@
 using Rhino.Mocks;
 using Ringtoets.Common.Data;
 using Ringtoets.Common.Data.AssessmentSection;
-using Ringtoets.Common.Data.Contribution;
-using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Data.TestUtil;
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresDataSynchronizationServiceTest.cs
===================================================================
diff -u -r71d8173532c9c038e25caf03e296beb8e8f9cbe8 -r8036936a18ebe45fafa40d67a016424a32668391
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresDataSynchronizationServiceTest.cs	(.../HeightStructuresDataSynchronizationServiceTest.cs)	(revision 71d8173532c9c038e25caf03e296beb8e8f9cbe8)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresDataSynchronizationServiceTest.cs	(.../HeightStructuresDataSynchronizationServiceTest.cs)	(revision 8036936a18ebe45fafa40d67a016424a32668391)
@@ -28,7 +28,6 @@
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.Hydraulics;
-using Ringtoets.Common.Data.Probability;
 using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Service;
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresValidationRulesRegistryTest.cs
===================================================================
diff -u -r399aaf485b3a62bab47cb4fe1095179850c42853 -r8036936a18ebe45fafa40d67a016424a32668391
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresValidationRulesRegistryTest.cs	(.../HeightStructuresValidationRulesRegistryTest.cs)	(revision 399aaf485b3a62bab47cb4fe1095179850c42853)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresValidationRulesRegistryTest.cs	(.../HeightStructuresValidationRulesRegistryTest.cs)	(revision 8036936a18ebe45fafa40d67a016424a32668391)
@@ -67,7 +67,7 @@
             // Assert
             ValidationRule[] validationRules = rules.ToArray();
             Assert.AreEqual(10, validationRules.Length);
-            
+
             Assert.IsInstanceOf<UseBreakWaterRule>(validationRules[0]);
             Assert.IsInstanceOf<VariationCoefficientLogNormalDistributionRule>(validationRules[1]);
             Assert.IsInstanceOf<NormalDistributionRule>(validationRules[2]);