Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/PresentationObjects/StabilityStoneCoverContext.cs
===================================================================
diff -u -r94f2ec1496623ae488b567f883e66b4d26243441 -rbdb905d20b711df1e5e2f5f0c656b9534f4ab8cc
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/PresentationObjects/StabilityStoneCoverContext.cs	(.../StabilityStoneCoverContext.cs)	(revision 94f2ec1496623ae488b567f883e66b4d26243441)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/PresentationObjects/StabilityStoneCoverContext.cs	(.../StabilityStoneCoverContext.cs)	(revision bdb905d20b711df1e5e2f5f0c656b9534f4ab8cc)
@@ -21,12 +21,10 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using Core.Common.Base;
 using Core.Common.Controls.PresentationObjects;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.DikeProfiles;
-using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.StabilityStoneCover.Data;
 
 namespace Ringtoets.StabilityStoneCover.Forms.PresentationObjects
@@ -82,18 +80,5 @@
                 return FailureMechanism.ForeshoreProfiles;
             }
         }
-
-        /// <summary>
-        /// Gets the hydraulic boundary locations currently known in the <see cref="AssessmentSection"/>.
-        /// </summary>
-        public IEnumerable<HydraulicBoundaryLocation> HydraulicBoundaryLocations
-        {
-            get
-            {
-                return AssessmentSection.HydraulicBoundaryDatabase == null ?
-                           Enumerable.Empty<HydraulicBoundaryLocation>() :
-                           AssessmentSection.HydraulicBoundaryDatabase.Locations;
-            }
-        }
     }
 }
\ No newline at end of file
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs
===================================================================
diff -u -r6949918830314633db5cc8c16bb2188779fffc93 -rbdb905d20b711df1e5e2f5f0c656b9534f4ab8cc
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs	(.../StabilityStoneCoverPlugin.cs)	(revision 6949918830314633db5cc8c16bb2188779fffc93)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs	(.../StabilityStoneCoverPlugin.cs)	(revision bdb905d20b711df1e5e2f5f0c656b9534f4ab8cc)
@@ -152,7 +152,7 @@
                     new WaveConditionsCalculationConfigurationImporter<StabilityStoneCoverWaveConditionsCalculation>(
                         filePath,
                         context.WrappedData,
-                        context.HydraulicBoundaryLocations,
+                        context.AssessmentSection.HydraulicBoundaryDatabase.Locations,
                         context.ForeshoreProfiles));
         }
 
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PresentationObjects/StabilityStoneCoverContextTest.cs
===================================================================
diff -u -rafc4b885597e413e57ab91f92d6bd79a0bc906a0 -rbdb905d20b711df1e5e2f5f0c656b9534f4ab8cc
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PresentationObjects/StabilityStoneCoverContextTest.cs	(.../StabilityStoneCoverContextTest.cs)	(revision afc4b885597e413e57ab91f92d6bd79a0bc906a0)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PresentationObjects/StabilityStoneCoverContextTest.cs	(.../StabilityStoneCoverContextTest.cs)	(revision bdb905d20b711df1e5e2f5f0c656b9534f4ab8cc)
@@ -20,13 +20,11 @@
 // All rights reserved.
 
 using System;
-using System.Collections.Generic;
 using Core.Common.Base;
 using Core.Common.Controls.PresentationObjects;
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
-using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.StabilityStoneCover.Data;
 using Ringtoets.StabilityStoneCover.Forms.PresentationObjects;
 
@@ -111,41 +109,9 @@
             Assert.AreSame(assessmentSection, context.AssessmentSection);
             Assert.AreSame(failureMechanism, context.FailureMechanism);
             Assert.AreSame(failureMechanism.ForeshoreProfiles, context.ForeshoreProfiles);
-            CollectionAssert.IsEmpty(context.HydraulicBoundaryLocations);
             mocks.VerifyAll();
         }
 
-        [Test]
-        public void HydraulicBoundaryLocations_HydraulicBoundaryDatabaseSet_ReturnsAllHydraulicBoundaryLocations()
-        {
-            // Setup
-            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
-            {
-                Locations =
-                {
-                    new HydraulicBoundaryLocation(1, "name", 1.1, 2.2)
-                }
-            };
-
-            var mocks = new MockRepository();
-            var assessmentSection = mocks.Stub<IAssessmentSection>();
-            var target = mocks.StrictMock<IObservable>();
-
-            assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase);
-
-            mocks.ReplayAll();
-
-            var failureMechanism = new StabilityStoneCoverFailureMechanism();
-            var context = new SimpleStabilityStoneCoverContext(target, failureMechanism, assessmentSection);
-
-            // Call
-            IEnumerable<HydraulicBoundaryLocation> availableHydraulicBoundaryLocations = context.HydraulicBoundaryLocations;
-
-            // Assert
-            Assert.AreSame(hydraulicBoundaryDatabase.Locations, availableHydraulicBoundaryLocations);
-            mocks.VerifyAll();
-        }
-
         private class SimpleStabilityStoneCoverContext : StabilityStoneCoverContext<IObservable>
         {
             public SimpleStabilityStoneCoverContext(IObservable wrappedData,
Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/PresentationObjects/WaveImpactAsphaltCoverContext.cs
===================================================================
diff -u -r08d25a2d4cd349395730ef39d3abf2cc51c30508 -rbdb905d20b711df1e5e2f5f0c656b9534f4ab8cc
--- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/PresentationObjects/WaveImpactAsphaltCoverContext.cs	(.../WaveImpactAsphaltCoverContext.cs)	(revision 08d25a2d4cd349395730ef39d3abf2cc51c30508)
+++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/PresentationObjects/WaveImpactAsphaltCoverContext.cs	(.../WaveImpactAsphaltCoverContext.cs)	(revision bdb905d20b711df1e5e2f5f0c656b9534f4ab8cc)
@@ -21,12 +21,10 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using Core.Common.Base;
 using Core.Common.Controls.PresentationObjects;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.DikeProfiles;
-using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.WaveImpactAsphaltCover.Data;
 
 namespace Ringtoets.WaveImpactAsphaltCover.Forms.PresentationObjects
@@ -84,18 +82,5 @@
                 return FailureMechanism.ForeshoreProfiles;
             }
         }
-
-        /// <summary>
-        /// Gets the hydraulic boundary locations currently known in the <see cref="AssessmentSection"/>.
-        /// </summary>
-        public IEnumerable<HydraulicBoundaryLocation> HydraulicBoundaryLocations
-        {
-            get
-            {
-                return AssessmentSection.HydraulicBoundaryDatabase == null ?
-                           Enumerable.Empty<HydraulicBoundaryLocation>() :
-                           AssessmentSection.HydraulicBoundaryDatabase.Locations;
-            }
-        }
     }
 }
\ No newline at end of file
Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs
===================================================================
diff -u -r6949918830314633db5cc8c16bb2188779fffc93 -rbdb905d20b711df1e5e2f5f0c656b9534f4ab8cc
--- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs	(.../WaveImpactAsphaltCoverPlugin.cs)	(revision 6949918830314633db5cc8c16bb2188779fffc93)
+++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs	(.../WaveImpactAsphaltCoverPlugin.cs)	(revision bdb905d20b711df1e5e2f5f0c656b9534f4ab8cc)
@@ -105,7 +105,7 @@
                     new WaveConditionsCalculationConfigurationImporter<WaveImpactAsphaltCoverWaveConditionsCalculation>(
                         filePath,
                         context.WrappedData,
-                        context.HydraulicBoundaryLocations,
+                        context.AssessmentSection.HydraulicBoundaryDatabase.Locations,
                         context.ForeshoreProfiles));
         }
 
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/PresentationObjects/WaveImpactAsphaltCoverContextTest.cs
===================================================================
diff -u -rd16b956efd5a1a40741037d55c88e9d24b0c0027 -rbdb905d20b711df1e5e2f5f0c656b9534f4ab8cc
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/PresentationObjects/WaveImpactAsphaltCoverContextTest.cs	(.../WaveImpactAsphaltCoverContextTest.cs)	(revision d16b956efd5a1a40741037d55c88e9d24b0c0027)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/PresentationObjects/WaveImpactAsphaltCoverContextTest.cs	(.../WaveImpactAsphaltCoverContextTest.cs)	(revision bdb905d20b711df1e5e2f5f0c656b9534f4ab8cc)
@@ -20,13 +20,11 @@
 // All rights reserved.
 
 using System;
-using System.Collections.Generic;
 using Core.Common.Base;
 using Core.Common.Controls.PresentationObjects;
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
-using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.WaveImpactAsphaltCover.Data;
 using Ringtoets.WaveImpactAsphaltCover.Forms.PresentationObjects;
 
@@ -62,7 +60,6 @@
             Assert.AreSame(assessmentSection, context.AssessmentSection);
             Assert.AreSame(failureMechanism, context.FailureMechanism);
             Assert.AreSame(failureMechanism.ForeshoreProfiles, context.ForeshoreProfiles);
-            CollectionAssert.IsEmpty(context.HydraulicBoundaryLocations);
             mockRepository.VerifyAll();
         }
 
@@ -100,30 +97,6 @@
             mockRepository.VerifyAll();
         }
 
-        [Test]
-        public void HydraulicBoundaryLocations_HydraulicBoundaryDatabaseSet_ReturnsAllHydraulicBoundaryLocations()
-        {
-            // Setup
-            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
-            hydraulicBoundaryDatabase.Locations.Add(new HydraulicBoundaryLocation(1, "name", 1.1, 2.2));
-
-            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
-            assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase);
-
-            var target = mockRepository.StrictMock<IObservable>();
-            mockRepository.ReplayAll();
-
-            var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism();
-            var context = new SimpleWaveImpactAsphaltCoverContext<IObservable>(target, failureMechanism, assessmentSection);
-
-            // Call
-            IEnumerable<HydraulicBoundaryLocation> availableHydraulicBoundaryLocations = context.HydraulicBoundaryLocations;
-
-            // Assert
-            Assert.AreSame(hydraulicBoundaryDatabase.Locations, availableHydraulicBoundaryLocations);
-            mockRepository.VerifyAll();
-        }
-
         private class SimpleWaveImpactAsphaltCoverContext<T> : WaveImpactAsphaltCoverContext<T> where T : IObservable
         {
             public SimpleWaveImpactAsphaltCoverContext(T target, WaveImpactAsphaltCoverFailureMechanism failureMechanism, IAssessmentSection assessmentSection)