Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs
===================================================================
diff -u -rb931302e2d719ea864a515e690ff929954c707ff -r095f760adcd5d00754c997c0214156cd7faaf873
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs	(.../RiskeerPlugin.cs)	(revision b931302e2d719ea864a515e690ff929954c707ff)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs	(.../RiskeerPlugin.cs)	(revision 095f760adcd5d00754c997c0214156cd7faaf873)
@@ -1818,7 +1818,6 @@
                 new ReferenceLineContext(nodeData.WrappedData.ReferenceLine, nodeData.WrappedData),
                 new NormContext(nodeData.WrappedData.FailureMechanismContribution, nodeData.WrappedData),
                 new FailureMechanismContributionContext(nodeData.WrappedData.FailureMechanismContribution, nodeData.WrappedData),
-                new HydraulicBoundaryDatabaseContext(nodeData.WrappedData.HydraulicBoundaryDatabase, nodeData.WrappedData),
                 nodeData.WrappedData.BackgroundData,
                 nodeData.WrappedData.Comments
             };
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionStateRootContextTreeNodeInfoTest.cs
===================================================================
diff -u -re7b2da23c1741fe8241c31fa592231a9724ea60a -r095f760adcd5d00754c997c0214156cd7faaf873
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionStateRootContextTreeNodeInfoTest.cs	(.../AssessmentSectionStateRootContextTreeNodeInfoTest.cs)	(revision e7b2da23c1741fe8241c31fa592231a9724ea60a)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionStateRootContextTreeNodeInfoTest.cs	(.../AssessmentSectionStateRootContextTreeNodeInfoTest.cs)	(revision 095f760adcd5d00754c997c0214156cd7faaf873)
@@ -181,7 +181,7 @@
                 object[] objects = info.ChildNodeObjects(assessmentSectionContext).ToArray();
 
                 // Assert
-                Assert.AreEqual(6, objects.Length);
+                Assert.AreEqual(5, objects.Length);
 
                 var referenceLineContext = (ReferenceLineContext) objects[0];
                 Assert.AreSame(assessmentSection.ReferenceLine, referenceLineContext.WrappedData);
@@ -195,14 +195,10 @@
                 Assert.AreSame(assessmentSection.FailureMechanismContribution, contributionContext.WrappedData);
                 Assert.AreSame(assessmentSection, contributionContext.Parent);
 
-                var context = (HydraulicBoundaryDatabaseContext) objects[3];
-                Assert.AreSame(assessmentSection.HydraulicBoundaryDatabase, context.WrappedData);
-                Assert.AreSame(assessmentSection, context.AssessmentSection);
-
-                var backgroundData = (BackgroundData) objects[4];
+                var backgroundData = (BackgroundData) objects[3];
                 Assert.AreSame(assessmentSection.BackgroundData, backgroundData);
 
-                var comment = (Comment) objects[5];
+                var comment = (Comment) objects[4];
                 Assert.AreSame(assessmentSection.Comments, comment);
             }
         }