Index: Riskeer/Common/src/Riskeer.Common.Data/AssemblyTool/AssemblyToolCategoriesFactory.cs
===================================================================
diff -u -rfa6b41745f75625989787406e5bb0001e6a71a2e -r7d67b3f344387474c2e70628aa6cc1d328559b87
--- Riskeer/Common/src/Riskeer.Common.Data/AssemblyTool/AssemblyToolCategoriesFactory.cs	(.../AssemblyToolCategoriesFactory.cs)	(revision fa6b41745f75625989787406e5bb0001e6a71a2e)
+++ Riskeer/Common/src/Riskeer.Common.Data/AssemblyTool/AssemblyToolCategoriesFactory.cs	(.../AssemblyToolCategoriesFactory.cs)	(revision 7d67b3f344387474c2e70628aa6cc1d328559b87)
@@ -54,126 +54,5 @@
                 throw new AssemblyException(e.Message, e);
             }
         }
-
-        /// <summary>
-        /// Creates the failure mechanism assembly categories.
-        /// </summary>
-        /// <param name="signalingNorm">The signaling norm to use in the calculation.</param>
-        /// <param name="lowerLimitNorm">The lower limit norm to use in the calculation.</param>
-        /// <param name="failureMechanismContribution">The failure mechanism contribution to calculate with.</param>
-        /// <param name="n">The 'N' parameter used to factor in the 'length effect'.</param>
-        /// <returns>An <see cref="IEnumerable{T}"/> with categories of
-        /// <see cref="FailureMechanismAssemblyCategory"/>.</returns>
-        /// <exception cref="AssemblyException">Thrown when an error occurred while creating the categories.</exception>
-        public static IEnumerable<FailureMechanismAssemblyCategory> CreateFailureMechanismAssemblyCategories(
-            double signalingNorm,
-            double lowerLimitNorm,
-            double failureMechanismContribution,
-            double n)
-        {
-            IAssemblyCategoriesCalculator calculator = AssemblyToolCalculatorFactoryOld.Instance.CreateAssemblyCategoriesCalculator(
-                AssemblyToolKernelFactoryOld.Instance);
-
-            try
-            {
-                return calculator.CalculateFailureMechanismCategories(new AssemblyCategoriesInput(
-                                                                          n, failureMechanismContribution / 100,
-                                                                          signalingNorm, lowerLimitNorm));
-            }
-            catch (AssemblyCategoriesCalculatorException e)
-            {
-                throw new AssemblyException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// Creates the failure mechanism assembly categories.
-        /// </summary>
-        /// <param name="signalingNorm">The signaling norm to use in the calculation.</param>
-        /// <param name="lowerLimitNorm">The lower limit norm to use in the calculation.</param>
-        /// <param name="failureProbabilityMarginFactor">The failure probability margin factor to
-        /// calculate with.</param>
-        /// <returns>An <see cref="IEnumerable{T}"/> with categories of
-        /// <see cref="FailureMechanismAssemblyCategory"/>.</returns>
-        /// <exception cref="AssemblyException">Thrown when an error occurred while creating the categories.</exception>
-        public static IEnumerable<FailureMechanismAssemblyCategory> CreateFailureMechanismAssemblyCategories(
-            double signalingNorm,
-            double lowerLimitNorm,
-            double failureProbabilityMarginFactor)
-        {
-            IAssemblyCategoriesCalculator calculator = AssemblyToolCalculatorFactoryOld.Instance.CreateAssemblyCategoriesCalculator(
-                AssemblyToolKernelFactoryOld.Instance);
-
-            try
-            {
-                return calculator.CalculateFailureMechanismCategories(new AssemblyCategoriesInput(
-                                                                          1, failureProbabilityMarginFactor,
-                                                                          signalingNorm, lowerLimitNorm));
-            }
-            catch (AssemblyCategoriesCalculatorException e)
-            {
-                throw new AssemblyException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// Creates the failure mechanism section assembly categories.
-        /// </summary>
-        /// <param name="signalingNorm">The signaling norm to use in the calculation.</param>
-        /// <param name="lowerLimitNorm">The lower limit norm to use in the calculation.</param>
-        /// <param name="failureMechanismContribution">The failure mechanism contribution to calculate with.</param>
-        /// <param name="n">The 'N' parameter used to factor in the 'length effect'.</param>
-        /// <returns>An <see cref="IEnumerable{T}"/> with categories of
-        /// <see cref="FailureMechanismSectionAssemblyCategory"/>.</returns>
-        /// <exception cref="AssemblyException">Thrown when an error occurred while creating the categories.</exception>
-        public static IEnumerable<FailureMechanismSectionAssemblyCategory> CreateFailureMechanismSectionAssemblyCategories(
-            double signalingNorm,
-            double lowerLimitNorm,
-            double failureMechanismContribution,
-            double n)
-        {
-            IAssemblyCategoriesCalculator calculator = AssemblyToolCalculatorFactoryOld.Instance.CreateAssemblyCategoriesCalculator(
-                AssemblyToolKernelFactoryOld.Instance);
-
-            try
-            {
-                return calculator.CalculateFailureMechanismSectionCategories(new AssemblyCategoriesInput(
-                                                                                 n, failureMechanismContribution / 100,
-                                                                                 signalingNorm, lowerLimitNorm));
-            }
-            catch (AssemblyCategoriesCalculatorException e)
-            {
-                throw new AssemblyException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// Creates the geotechnical failure mechanism section assembly categories.
-        /// </summary>
-        /// <param name="normativeNorm">The norm to use in the calculation.</param>
-        /// <param name="failureMechanismContribution">The failure mechanism contribution to calculate with.</param>
-        /// <param name="n">The 'N' parameter used to factor in the 'length effect'.</param>
-        /// <returns>An <see cref="IEnumerable{T}"/> with categories of
-        /// <see cref="FailureMechanismSectionAssemblyCategory"/>.</returns>
-        /// <exception cref="AssemblyException">Thrown when an error occurred while creating the categories.</exception>
-        public static IEnumerable<FailureMechanismSectionAssemblyCategory> CreateGeotechnicalFailureMechanismSectionAssemblyCategories(
-            double normativeNorm,
-            double failureMechanismContribution,
-            double n)
-        {
-            IAssemblyCategoriesCalculator calculator = AssemblyToolCalculatorFactoryOld.Instance.CreateAssemblyCategoriesCalculator(
-                AssemblyToolKernelFactoryOld.Instance);
-
-            try
-            {
-                return calculator.CalculateGeotechnicalFailureMechanismSectionCategories(normativeNorm,
-                                                                                         n,
-                                                                                         failureMechanismContribution / 100);
-            }
-            catch (AssemblyCategoriesCalculatorException e)
-            {
-                throw new AssemblyException(e.Message, e);
-            }
-        }
     }
 }
\ No newline at end of file
Index: Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/AssemblyToolCategoriesFactoryTest.cs
===================================================================
diff -u -r3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7 -r7d67b3f344387474c2e70628aa6cc1d328559b87
--- Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/AssemblyToolCategoriesFactoryTest.cs	(.../AssemblyToolCategoriesFactoryTest.cs)	(revision 3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7)
+++ Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/AssemblyToolCategoriesFactoryTest.cs	(.../AssemblyToolCategoriesFactoryTest.cs)	(revision 7d67b3f344387474c2e70628aa6cc1d328559b87)
@@ -94,331 +94,13 @@
                 calculator.ThrowExceptionOnCalculate = true;
 
                 // Call
-                TestDelegate test = () => AssemblyToolCategoriesFactory.CreateAssessmentSectionAssemblyCategories(0, 0);
+                void Call() => AssemblyToolCategoriesFactory.CreateAssessmentSectionAssemblyCategories(0, 0);
 
                 // Assert
-                var exception = Assert.Throws<AssemblyException>(test);
+                var exception = Assert.Throws<AssemblyException>(Call);
                 Assert.IsInstanceOf<AssemblyCategoriesCalculatorException>(exception.InnerException);
                 Assert.AreEqual(exception.InnerException.Message, exception.Message);
             }
         }
-
-        [Test]
-        public void CreateFailureMechanismAssemblyCategoriesWithN_WithInput_SetsInputOnCalculator()
-        {
-            // Setup
-            var random = new Random(11);
-            double signalingNorm = random.NextDouble();
-            double lowerLimitNorm = random.NextDouble();
-            double failureMechanismContribution = random.NextDouble();
-            double n = random.NextDouble();
-
-            using (new AssemblyToolCalculatorFactoryConfigOld())
-            {
-                var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance;
-                AssemblyCategoriesCalculatorStub calculator = calculatorFactory.LastCreatedAssemblyCategoriesCalculator;
-
-                // Call
-                AssemblyToolCategoriesFactory.CreateFailureMechanismAssemblyCategories(signalingNorm,
-                                                                                       lowerLimitNorm,
-                                                                                       failureMechanismContribution,
-                                                                                       n);
-
-                // Assert
-                AssemblyCategoriesInput assemblyCategoriesInput = calculator.AssemblyCategoriesInput;
-                Assert.AreEqual(signalingNorm, assemblyCategoriesInput.SignalingNorm);
-                Assert.AreEqual(lowerLimitNorm, assemblyCategoriesInput.LowerLimitNorm);
-                Assert.AreEqual(failureMechanismContribution / 100, assemblyCategoriesInput.FailureMechanismContribution);
-                Assert.AreEqual(n, assemblyCategoriesInput.N);
-            }
-        }
-
-        [Test]
-        public void CreateFailureMechanismAssemblyCategoriesWithN_CalculatorRan_ReturnsOutput()
-        {
-            // Setup
-            var random = new Random(11);
-            double signalingNorm = random.NextDouble();
-            double lowerLimitNorm = random.NextDouble();
-            double failureMechanismContribution = random.NextDouble();
-            double n = random.NextDouble();
-
-            using (new AssemblyToolCalculatorFactoryConfigOld())
-            {
-                var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance;
-                AssemblyCategoriesCalculatorStub calculator = calculatorFactory.LastCreatedAssemblyCategoriesCalculator;
-
-                // Call
-                FailureMechanismAssemblyCategory[] output = AssemblyToolCategoriesFactory.CreateFailureMechanismAssemblyCategories(
-                    signalingNorm,
-                    lowerLimitNorm,
-                    failureMechanismContribution,
-                    n).ToArray();
-
-                // Assert
-                FailureMechanismAssemblyCategory[] calculatorOutput = calculator.FailureMechanismCategoriesOutput.ToArray();
-
-                Assert.AreEqual(calculatorOutput.Length, output.Length);
-                CollectionAssert.AreEqual(calculatorOutput.Select(co => co.LowerBoundary), output.Select(o => o.LowerBoundary));
-                CollectionAssert.AreEqual(calculatorOutput.Select(co => co.UpperBoundary), output.Select(o => o.UpperBoundary));
-                CollectionAssert.AreEqual(calculatorOutput.Select(co => co.Group), output.Select(o => o.Group));
-            }
-        }
-
-        [Test]
-        public void CreateFailureMechanismAssemblyCategoriesWithN_CalculatorThrowsException_ThrowsAssemblyException()
-        {
-            // Setup
-            using (new AssemblyToolCalculatorFactoryConfigOld())
-            {
-                var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance;
-                AssemblyCategoriesCalculatorStub calculator = calculatorFactory.LastCreatedAssemblyCategoriesCalculator;
-                calculator.ThrowExceptionOnCalculate = true;
-
-                // Call
-                TestDelegate test = () => AssemblyToolCategoriesFactory.CreateFailureMechanismAssemblyCategories(0, 0, 0, 0);
-
-                // Assert
-                var exception = Assert.Throws<AssemblyException>(test);
-                Assert.IsInstanceOf<AssemblyCategoriesCalculatorException>(exception.InnerException);
-                Assert.AreEqual(exception.InnerException.Message, exception.Message);
-            }
-        }
-
-        [Test]
-        public void CreateFailureMechanismAssemblyCategories_WithInput_SetsInputOnCalculator()
-        {
-            // Setup
-            var random = new Random(11);
-            double signalingNorm = random.NextDouble();
-            double lowerLimitNorm = random.NextDouble();
-            double failureProbabilityMarginFactor = random.NextDouble();
-
-            using (new AssemblyToolCalculatorFactoryConfigOld())
-            {
-                var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance;
-                AssemblyCategoriesCalculatorStub calculator = calculatorFactory.LastCreatedAssemblyCategoriesCalculator;
-
-                // Call
-                AssemblyToolCategoriesFactory.CreateFailureMechanismAssemblyCategories(signalingNorm,
-                                                                                       lowerLimitNorm,
-                                                                                       failureProbabilityMarginFactor);
-
-                // Assert
-                AssemblyCategoriesInput assemblyCategoriesInput = calculator.AssemblyCategoriesInput;
-                Assert.AreEqual(signalingNorm, assemblyCategoriesInput.SignalingNorm);
-                Assert.AreEqual(lowerLimitNorm, assemblyCategoriesInput.LowerLimitNorm);
-                Assert.AreEqual(failureProbabilityMarginFactor, assemblyCategoriesInput.FailureMechanismContribution);
-                Assert.AreEqual(1, assemblyCategoriesInput.N);
-            }
-        }
-
-        [Test]
-        public void CreateFailureMechanismAssemblyCategories_CalculatorRan_ReturnsOutput()
-        {
-            // Setup
-            var random = new Random(11);
-            double signalingNorm = random.NextDouble();
-            double lowerLimitNorm = random.NextDouble();
-            double failureProbabilityMarginFactor = random.NextDouble();
-
-            using (new AssemblyToolCalculatorFactoryConfigOld())
-            {
-                var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance;
-                AssemblyCategoriesCalculatorStub calculator = calculatorFactory.LastCreatedAssemblyCategoriesCalculator;
-
-                // Call
-                FailureMechanismAssemblyCategory[] output = AssemblyToolCategoriesFactory.CreateFailureMechanismAssemblyCategories(
-                    signalingNorm,
-                    lowerLimitNorm,
-                    failureProbabilityMarginFactor).ToArray();
-
-                // Assert
-                FailureMechanismAssemblyCategory[] calculatorOutput = calculator.FailureMechanismCategoriesOutput.ToArray();
-
-                Assert.AreEqual(calculatorOutput.Length, output.Length);
-                CollectionAssert.AreEqual(calculatorOutput.Select(co => co.LowerBoundary), output.Select(o => o.LowerBoundary));
-                CollectionAssert.AreEqual(calculatorOutput.Select(co => co.UpperBoundary), output.Select(o => o.UpperBoundary));
-                CollectionAssert.AreEqual(calculatorOutput.Select(co => co.Group), output.Select(o => o.Group));
-            }
-        }
-
-        [Test]
-        public void CreateFailureMechanismAssemblyCategories_CalculatorThrowsException_ThrowsAssemblyException()
-        {
-            // Setup
-            using (new AssemblyToolCalculatorFactoryConfigOld())
-            {
-                var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance;
-                AssemblyCategoriesCalculatorStub calculator = calculatorFactory.LastCreatedAssemblyCategoriesCalculator;
-                calculator.ThrowExceptionOnCalculate = true;
-
-                // Call
-                TestDelegate test = () => AssemblyToolCategoriesFactory.CreateFailureMechanismAssemblyCategories(0, 0, 0);
-
-                // Assert
-                var exception = Assert.Throws<AssemblyException>(test);
-                Assert.IsInstanceOf<AssemblyCategoriesCalculatorException>(exception.InnerException);
-                Assert.AreEqual(exception.InnerException.Message, exception.Message);
-            }
-        }
-
-        [Test]
-        public void CreateFailureMechanismSectionAssemblyCategories_WithInput_SetsInputOnCalculator()
-        {
-            // Setup
-            var random = new Random(11);
-            double signalingNorm = random.NextDouble();
-            double lowerLimitNorm = random.NextDouble();
-            double failureMechanismContribution = random.NextDouble();
-            double n = random.NextDouble();
-
-            using (new AssemblyToolCalculatorFactoryConfigOld())
-            {
-                var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance;
-                AssemblyCategoriesCalculatorStub calculator = calculatorFactory.LastCreatedAssemblyCategoriesCalculator;
-
-                // Call
-                AssemblyToolCategoriesFactory.CreateFailureMechanismSectionAssemblyCategories(signalingNorm,
-                                                                                              lowerLimitNorm,
-                                                                                              failureMechanismContribution,
-                                                                                              n);
-
-                // Assert
-                AssemblyCategoriesInput assemblyCategoriesInput = calculator.AssemblyCategoriesInput;
-                Assert.AreEqual(signalingNorm, assemblyCategoriesInput.SignalingNorm);
-                Assert.AreEqual(lowerLimitNorm, assemblyCategoriesInput.LowerLimitNorm);
-                Assert.AreEqual(failureMechanismContribution / 100, assemblyCategoriesInput.FailureMechanismContribution);
-                Assert.AreEqual(n, assemblyCategoriesInput.N);
-            }
-        }
-
-        [Test]
-        public void CreateFailureMechanismSectionAssemblyCategories_CalculatorRan_ReturnsOutput()
-        {
-            // Setup
-            var random = new Random(11);
-            double signalingNorm = random.NextDouble();
-            double lowerLimitNorm = random.NextDouble();
-            double failureMechanismContribution = random.NextDouble();
-            double n = random.NextDouble();
-
-            using (new AssemblyToolCalculatorFactoryConfigOld())
-            {
-                var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance;
-                AssemblyCategoriesCalculatorStub calculator = calculatorFactory.LastCreatedAssemblyCategoriesCalculator;
-
-                // Call
-                FailureMechanismSectionAssemblyCategory[] output = AssemblyToolCategoriesFactory.CreateFailureMechanismSectionAssemblyCategories(
-                    signalingNorm,
-                    lowerLimitNorm,
-                    failureMechanismContribution,
-                    n).ToArray();
-
-                // Assert
-                FailureMechanismSectionAssemblyCategory[] calculatorOutput = calculator.FailureMechanismSectionCategoriesOutput.ToArray();
-
-                Assert.AreEqual(calculatorOutput.Length, output.Length);
-                CollectionAssert.AreEqual(calculatorOutput.Select(co => co.LowerBoundary), output.Select(o => o.LowerBoundary));
-                CollectionAssert.AreEqual(calculatorOutput.Select(co => co.UpperBoundary), output.Select(o => o.UpperBoundary));
-                CollectionAssert.AreEqual(calculatorOutput.Select(co => co.Group), output.Select(o => o.Group));
-            }
-        }
-
-        [Test]
-        public void CreateFailureMechanismSectionAssemblyCategories_CalculatorThrowsException_ThrowsAssemblyException()
-        {
-            // Setup
-            using (new AssemblyToolCalculatorFactoryConfigOld())
-            {
-                var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance;
-                AssemblyCategoriesCalculatorStub calculator = calculatorFactory.LastCreatedAssemblyCategoriesCalculator;
-                calculator.ThrowExceptionOnCalculate = true;
-
-                // Call
-                TestDelegate test = () => AssemblyToolCategoriesFactory.CreateFailureMechanismSectionAssemblyCategories(0, 0, 0, 0);
-
-                // Assert
-                var exception = Assert.Throws<AssemblyException>(test);
-                Assert.IsInstanceOf<AssemblyCategoriesCalculatorException>(exception.InnerException);
-                Assert.AreEqual(exception.InnerException.Message, exception.Message);
-            }
-        }
-
-        [Test]
-        public void CreateGeotechnicalFailureMechanismSectionAssemblyCategories_WithInput_SetsInputOnCalculator()
-        {
-            // Setup
-            var random = new Random(11);
-            double normativeNorm = random.NextDouble();
-            double failureMechanismContribution = random.NextDouble();
-            double n = random.NextDouble();
-
-            using (new AssemblyToolCalculatorFactoryConfigOld())
-            {
-                var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance;
-                AssemblyCategoriesCalculatorStub calculator = calculatorFactory.LastCreatedAssemblyCategoriesCalculator;
-
-                // Call
-                AssemblyToolCategoriesFactory.CreateGeotechnicalFailureMechanismSectionAssemblyCategories(normativeNorm,
-                                                                                                          failureMechanismContribution,
-                                                                                                          n);
-
-                // Assert
-                Assert.AreEqual(normativeNorm, calculator.NormativeNorm);
-                Assert.AreEqual(failureMechanismContribution / 100, calculator.FailureMechanismContribution);
-                Assert.AreEqual(n, calculator.FailureMechanismN);
-            }
-        }
-
-        [Test]
-        public void CreateGeotechnicalFailureMechanismSectionAssemblyCategories_CalculatorRan_ReturnsOutput()
-        {
-            // Setup
-            var random = new Random(11);
-            double normativeNorm = random.NextDouble();
-            double failureMechanismContribution = random.NextDouble();
-            double n = random.NextDouble();
-
-            using (new AssemblyToolCalculatorFactoryConfigOld())
-            {
-                var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance;
-                AssemblyCategoriesCalculatorStub calculator = calculatorFactory.LastCreatedAssemblyCategoriesCalculator;
-
-                // Call
-                FailureMechanismSectionAssemblyCategory[] output = AssemblyToolCategoriesFactory.CreateGeotechnicalFailureMechanismSectionAssemblyCategories(
-                    normativeNorm,
-                    failureMechanismContribution,
-                    n).ToArray();
-
-                // Assert
-                FailureMechanismSectionAssemblyCategory[] calculatorOutput = calculator.GeotechnicalFailureMechanismSectionCategoriesOutput.ToArray();
-
-                Assert.AreEqual(calculatorOutput.Length, output.Length);
-                CollectionAssert.AreEqual(calculatorOutput.Select(co => co.LowerBoundary), output.Select(o => o.LowerBoundary));
-                CollectionAssert.AreEqual(calculatorOutput.Select(co => co.UpperBoundary), output.Select(o => o.UpperBoundary));
-                CollectionAssert.AreEqual(calculatorOutput.Select(co => co.Group), output.Select(o => o.Group));
-            }
-        }
-
-        [Test]
-        public void CreateGeotechnicalFailureMechanismSectionAssemblyCategories_CalculatorThrowsException_ThrowsAssemblyException()
-        {
-            // Setup
-            using (new AssemblyToolCalculatorFactoryConfigOld())
-            {
-                var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance;
-                AssemblyCategoriesCalculatorStub calculator = calculatorFactory.LastCreatedAssemblyCategoriesCalculator;
-                calculator.ThrowExceptionOnCalculate = true;
-
-                // Call
-                TestDelegate test = () => AssemblyToolCategoriesFactory.CreateGeotechnicalFailureMechanismSectionAssemblyCategories(0, 0, 0);
-
-                // Assert
-                var exception = Assert.Throws<AssemblyException>(test);
-                Assert.IsInstanceOf<AssemblyCategoriesCalculatorException>(exception.InnerException);
-                Assert.AreEqual(exception.InnerException.Message, exception.Message);
-            }
-        }
     }
 }
\ No newline at end of file