Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HydraulicBoundaryLocationCreateExtensions.cs
===================================================================
diff -u -r473a24c3ace837a552c2209eb93002d3cbf14140 -ra80af1a8fb7a87cd61648d481c8694bc22a763da
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HydraulicBoundaryLocationCreateExtensions.cs	(.../HydraulicBoundaryLocationCreateExtensions.cs)	(revision 473a24c3ace837a552c2209eb93002d3cbf14140)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HydraulicBoundaryLocationCreateExtensions.cs	(.../HydraulicBoundaryLocationCreateExtensions.cs)	(revision a80af1a8fb7a87cd61648d481c8694bc22a763da)
@@ -63,14 +63,6 @@
                 Name = location.Name.DeepClone(),
                 LocationX = location.Location.X.ToNaNAsNull(),
                 LocationY = location.Location.Y.ToNaNAsNull(),
-                HydraulicLocationCalculationEntity = location.WaveHeightCalculation4.Create(),
-                HydraulicLocationCalculationEntity1 = location.WaveHeightCalculation3.Create(),
-                HydraulicLocationCalculationEntity2 = location.WaveHeightCalculation2.Create(),
-                HydraulicLocationCalculationEntity3 = location.WaveHeightCalculation1.Create(),
-                HydraulicLocationCalculationEntity4 = location.DesignWaterLevelCalculation4.Create(),
-                HydraulicLocationCalculationEntity5 = location.DesignWaterLevelCalculation3.Create(),
-                HydraulicLocationCalculationEntity6 = location.DesignWaterLevelCalculation2.Create(),
-                HydraulicLocationCalculationEntity7 = location.DesignWaterLevelCalculation1.Create(),
                 Order = order
             };
 
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/HydraulicBoundaryLocationCreateExtensionsTest.cs
===================================================================
diff -u -r473a24c3ace837a552c2209eb93002d3cbf14140 -ra80af1a8fb7a87cd61648d481c8694bc22a763da
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/HydraulicBoundaryLocationCreateExtensionsTest.cs	(.../HydraulicBoundaryLocationCreateExtensionsTest.cs)	(revision 473a24c3ace837a552c2209eb93002d3cbf14140)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/HydraulicBoundaryLocationCreateExtensionsTest.cs	(.../HydraulicBoundaryLocationCreateExtensionsTest.cs)	(revision a80af1a8fb7a87cd61648d481c8694bc22a763da)
@@ -147,15 +147,6 @@
             Assert.AreEqual(coordinateX, entity.LocationX);
             Assert.AreEqual(coordinateY, entity.LocationY);
             Assert.AreEqual(order, entity.Order);
-
-            AssertHydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation.DesignWaterLevelCalculation1, entity.HydraulicLocationCalculationEntity7);
-            AssertHydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation.DesignWaterLevelCalculation2, entity.HydraulicLocationCalculationEntity6);
-            AssertHydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation.DesignWaterLevelCalculation3, entity.HydraulicLocationCalculationEntity5);
-            AssertHydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation.DesignWaterLevelCalculation4, entity.HydraulicLocationCalculationEntity4);
-            AssertHydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation.WaveHeightCalculation1, entity.HydraulicLocationCalculationEntity3);
-            AssertHydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation.WaveHeightCalculation2, entity.HydraulicLocationCalculationEntity2);
-            AssertHydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation.WaveHeightCalculation3, entity.HydraulicLocationCalculationEntity1);
-            AssertHydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation.WaveHeightCalculation4, entity.HydraulicLocationCalculationEntity);
         }
 
         [Test]
@@ -348,22 +339,6 @@
             Assert.AreSame(entity1, entity2);
         }
 
-        private static void AssertHydraulicBoundaryLocationCalculation(HydraulicBoundaryLocationCalculation calculation,
-                                                                       HydraulicLocationCalculationEntity entity)
-        {
-            Assert.AreEqual(Convert.ToByte(calculation.InputParameters.ShouldIllustrationPointsBeCalculated),
-                            entity.ShouldIllustrationPointsBeCalculated);
-
-            if (calculation.Output == null)
-            {
-                CollectionAssert.IsEmpty(entity.HydraulicLocationOutputEntities);
-            }
-            else
-            {
-                Assert.AreEqual(1, entity.HydraulicLocationOutputEntities.Count);
-            }
-        }
-
         private static GrassCoverErosionOutwardsHydraulicLocationOutputEntity GetHydraulicLocationOutputEntity(
             GrassCoverErosionOutwardsHydraulicLocationEntity entity, HydraulicLocationOutputType outputType)
         {