Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs
===================================================================
diff -u -rce79c9c34ebed8fa715e523a886269a41e1e50c1 -r7996db20fc554ad151b0a70036b6795820d806e1
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs	(.../RiskeerPlugin.cs)	(revision ce79c9c34ebed8fa715e523a886269a41e1e50c1)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs	(.../RiskeerPlugin.cs)	(revision 7996db20fc554ad151b0a70036b6795820d806e1)
@@ -100,7 +100,6 @@
 using Riskeer.Integration.Service.Comparers;
 using Riskeer.MacroStabilityInwards.Data;
 using Riskeer.MacroStabilityInwards.Forms.PresentationObjects;
-using Riskeer.Piping.Data;
 using Riskeer.Piping.Forms.PresentationObjects;
 using Riskeer.StabilityPointStructures.Data;
 using Riskeer.StabilityPointStructures.Forms.PresentationObjects;
@@ -135,12 +134,6 @@
         private static readonly IEnumerable<FailureMechanismContextAssociation> failureMechanismAssociations = new[]
         {
             new FailureMechanismContextAssociation(
-                typeof(PipingFailureMechanism),
-                (mechanism, assessmentSection) => new PipingFailureMechanismCalculationStateContext(
-                    (PipingFailureMechanism) mechanism,
-                    assessmentSection)
-            ),
-            new FailureMechanismContextAssociation(
                 typeof(GrassCoverErosionInwardsFailureMechanism),
                 (mechanism, assessmentSection) => new GrassCoverErosionInwardsFailureMechanismContext(
                     (GrassCoverErosionInwardsFailureMechanism) mechanism,
@@ -1760,7 +1753,6 @@
 
             var failureMechanisms = new IFailureMechanism[]
             {
-                assessmentSection.Piping,
                 assessmentSection.GrassCoverErosionInwards,
                 assessmentSection.MacroStabilityInwards,
                 assessmentSection.StabilityStoneCover,
@@ -1774,7 +1766,8 @@
 
             var childNodes = new List<object>
             {
-                new HydraulicBoundaryDatabaseContext(assessmentSection.HydraulicBoundaryDatabase, assessmentSection)
+                new HydraulicBoundaryDatabaseContext(assessmentSection.HydraulicBoundaryDatabase, assessmentSection),
+                new PipingFailureMechanismCalculationStateContext(assessmentSection.Piping, assessmentSection)
             };
 
             childNodes.AddRange(failureMechanisms.Select(failureMechanism => failureMechanismAssociations