Index: Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/AssessmentSectionAssemblyFactory.cs
===================================================================
diff -u -r65d3831c5ba299ffd5a004e7886c0e829f318065 -re3f0175cd4c43d572595882527bd545e5d92c6a9
--- Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/AssessmentSectionAssemblyFactory.cs	(.../AssessmentSectionAssemblyFactory.cs)	(revision 65d3831c5ba299ffd5a004e7886c0e829f318065)
+++ Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/AssessmentSectionAssemblyFactory.cs	(.../AssessmentSectionAssemblyFactory.cs)	(revision e3f0175cd4c43d572595882527bd545e5d92c6a9)
@@ -201,41 +201,12 @@
         {
             var failureMechanismAssemblies = new List<double>();
 
-            AssembleWhenApplicable(failureMechanismAssemblies, assessmentSection.Piping, assessmentSection,
-                                   PipingFailureMechanismAssemblyFactory.AssembleFailureMechanism);
-            AssembleWhenApplicable(failureMechanismAssemblies, assessmentSection.MacroStabilityInwards, assessmentSection,
-                                   MacroStabilityInwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism);
-            AssembleWhenApplicable(failureMechanismAssemblies, assessmentSection.GrassCoverErosionInwards, assessmentSection,
-                                   GrassCoverErosionInwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism);
-            AssembleWhenApplicable(failureMechanismAssemblies, assessmentSection.ClosingStructures, assessmentSection,
-                                   ClosingStructuresFailureMechanismAssemblyFactory.AssembleFailureMechanism);
             AssembleWhenApplicable(failureMechanismAssemblies, assessmentSection.HeightStructures, assessmentSection,
                                    HeightStructuresFailureMechanismAssemblyFactory.AssembleFailureMechanism);
-            AssembleWhenApplicable(failureMechanismAssemblies, assessmentSection.StabilityPointStructures, assessmentSection,
-                                   StabilityPointStructuresFailureMechanismAssemblyFactory.AssembleFailureMechanism);
-            AssembleWhenApplicable(failureMechanismAssemblies, assessmentSection.GrassCoverErosionOutwards, assessmentSection,
-                                   GrassCoverErosionOutwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism);
-            AssembleWhenApplicable(failureMechanismAssemblies, assessmentSection.StabilityStoneCover, assessmentSection,
-                                   StabilityStoneCoverFailureMechanismAssemblyFactory.AssembleFailureMechanism);
-            AssembleWhenApplicable(failureMechanismAssemblies, assessmentSection.WaveImpactAsphaltCover, assessmentSection,
-                                   WaveImpactAsphaltCoverFailureMechanismAssemblyFactory.AssembleFailureMechanism);
-            AssembleWhenApplicable(failureMechanismAssemblies, assessmentSection.DuneErosion, assessmentSection,
-                                   DuneErosionFailureMechanismAssemblyFactory.AssembleFailureMechanism);
-            AssembleWhenApplicable(failureMechanismAssemblies, assessmentSection.PipingStructure, assessmentSection,
-                                   PipingStructureFailureMechanismAssemblyFactory.AssembleFailureMechanism);
-            AssembleWhenApplicable(failureMechanismAssemblies, assessmentSection.GrassCoverSlipOffInwards, assessmentSection,
-                                   FailureMechanismAssemblyFactory.AssembleFailureMechanism);
-            AssembleWhenApplicable(failureMechanismAssemblies, assessmentSection.GrassCoverSlipOffOutwards, assessmentSection,
-                                   FailureMechanismAssemblyFactory.AssembleFailureMechanism);
-            AssembleWhenApplicable(failureMechanismAssemblies, assessmentSection.Microstability, assessmentSection,
-                                   FailureMechanismAssemblyFactory.AssembleFailureMechanism);
-            AssembleWhenApplicable(failureMechanismAssemblies, assessmentSection.WaterPressureAsphaltCover, assessmentSection,
-                                   FailureMechanismAssemblyFactory.AssembleFailureMechanism);
+            AssembleWhenApplicable(failureMechanismAssemblies, assessmentSection.GrassCoverErosionInwards, assessmentSection,
+                                   GrassCoverErosionInwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism);
 
-            failureMechanismAssemblies.AddRange(assessmentSection.SpecificFailureMechanisms
-                                                                 .Where(fp => fp.InAssembly)
-                                                                 .Select(fp => FailureMechanismAssemblyFactory.AssembleFailureMechanism(fp, assessmentSection)
-                                                                                                              .AssemblyResult));
+            failureMechanismAssemblies.AddRange(GetUncorrelatedFailureMechanismAssemblyResults(assessmentSection));
 
             return failureMechanismAssemblies;
         }
Index: Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/AssessmentSectionAssemblyHelper.cs
===================================================================
diff -u -r65d3831c5ba299ffd5a004e7886c0e829f318065 -re3f0175cd4c43d572595882527bd545e5d92c6a9
--- Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/AssessmentSectionAssemblyHelper.cs	(.../AssessmentSectionAssemblyHelper.cs)	(revision 65d3831c5ba299ffd5a004e7886c0e829f318065)
+++ Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/AssessmentSectionAssemblyHelper.cs	(.../AssessmentSectionAssemblyHelper.cs)	(revision e3f0175cd4c43d572595882527bd545e5d92c6a9)
@@ -1,20 +1,23 @@
 // Copyright (C) Stichting Deltares and State of the Netherlands 2023. All rights reserved.
+//
+// This file is part of Riskeer.
+//
+// Riskeer is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
 // 
-// This file is part of DiKErnel.
-// 
-// DiKErnel is free software: you can redistribute it and/or modify it under the terms of the
-// GNU Lesser General Public License as published by the Free Software Foundation, either
-// version 3 of the License, or (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
-// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-// See the GNU Lesser General Public License for more details.
-// 
-// You should have received a copy of the GNU Lesser General Public License along with this
-// program. If not, see <http://www.gnu.org/licenses/>.
-// 
-// All names, logos, and references to "Deltares" are registered trademarks of Stichting
-// Deltares and remain full property of Stichting Deltares at all times. All rights reserved.
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
 
 using System;