Index: Riskeer/Piping/src/Riskeer.Piping.Forms/PresentationObjects/EmptyPipingOutput.cs
===================================================================
diff -u -rc2f92cc6160aebf4030923e296c0085b66ce4270 -r20e7e6fa8aa7f33ace3cf0bee9dc3ce2fc4015c1
--- Riskeer/Piping/src/Riskeer.Piping.Forms/PresentationObjects/EmptyPipingOutput.cs	(.../EmptyPipingOutput.cs)	(revision c2f92cc6160aebf4030923e296c0085b66ce4270)
+++ Riskeer/Piping/src/Riskeer.Piping.Forms/PresentationObjects/EmptyPipingOutput.cs	(.../EmptyPipingOutput.cs)	(revision 20e7e6fa8aa7f33ace3cf0bee9dc3ce2fc4015c1)
@@ -19,13 +19,12 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using Riskeer.Piping.Data;
 using Riskeer.Piping.Data.SemiProbabilistic;
 
 namespace Riskeer.Piping.Forms.PresentationObjects
 {
     /// <summary>
-    /// This class represents the placeholder for a <see cref="SemiProbabilisticPipingOutput"/> for a <see cref="PipingCalculation{TPipingInput,TPipingOutput}"/>
+    /// This class represents the placeholder for a <see cref="SemiProbabilisticPipingOutput"/> for a <see cref="SemiProbabilisticPipingCalculation"/>
     /// that hasn't been calculated yet.
     /// </summary>
     public class EmptyPipingOutput {}
Index: Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingCalculationTest.cs
===================================================================
diff -u -rede07a979f3514eb3458a2ab9be01095234aefcc -r20e7e6fa8aa7f33ace3cf0bee9dc3ce2fc4015c1
--- Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingCalculationTest.cs	(.../PipingCalculationTest.cs)	(revision ede07a979f3514eb3458a2ab9be01095234aefcc)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingCalculationTest.cs	(.../PipingCalculationTest.cs)	(revision 20e7e6fa8aa7f33ace3cf0bee9dc3ce2fc4015c1)
@@ -23,7 +23,6 @@
 using Core.Common.Base;
 using Core.Common.Data.TestUtil;
 using NUnit.Framework;
-using Riskeer.Piping.Data.SemiProbabilistic;
 using Riskeer.Piping.Data.TestUtil;
 
 namespace Riskeer.Piping.Data.Test
@@ -89,7 +88,7 @@
         public void Clone_AllPropertiesSet_ReturnNewInstanceWithCopiedValues()
         {
             // Setup
-            PipingCalculation<PipingInput, SemiProbabilisticPipingOutput> original = CreateRandomCalculationWithoutOutput();
+            PipingCalculation<PipingInput> original = CreateRandomCalculationWithoutOutput();
 
             // Call
             object clone = original.Clone();
@@ -102,7 +101,7 @@
         public void Clone_NotAllPropertiesSet_ReturnNewInstanceWithCopiedValues()
         {
             // Setup
-            PipingCalculation<PipingInput, SemiProbabilisticPipingOutput> original = CreateRandomCalculationWithoutOutput();
+            PipingCalculation<PipingInput> original = CreateRandomCalculationWithoutOutput();
 
             // Call
             object clone = original.Clone();
@@ -111,7 +110,7 @@
             CoreCloneAssert.AreObjectClones(original, clone, PipingCloneAssert.AreClones);
         }
 
-        private static PipingCalculation<PipingInput, SemiProbabilisticPipingOutput> CreateRandomCalculationWithoutOutput()
+        private static PipingCalculation<PipingInput> CreateRandomCalculationWithoutOutput()
         {
             var calculation = new TestPipingCalculation
             {
Index: Riskeer/Piping/test/Riskeer.Piping.Data.Test/Probabilistic/ProbabilisticPipingCalculationTest.cs
===================================================================
diff -u -rc2f92cc6160aebf4030923e296c0085b66ce4270 -r20e7e6fa8aa7f33ace3cf0bee9dc3ce2fc4015c1
--- Riskeer/Piping/test/Riskeer.Piping.Data.Test/Probabilistic/ProbabilisticPipingCalculationTest.cs	(.../ProbabilisticPipingCalculationTest.cs)	(revision c2f92cc6160aebf4030923e296c0085b66ce4270)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.Test/Probabilistic/ProbabilisticPipingCalculationTest.cs	(.../ProbabilisticPipingCalculationTest.cs)	(revision 20e7e6fa8aa7f33ace3cf0bee9dc3ce2fc4015c1)
@@ -21,7 +21,6 @@
 
 using NUnit.Framework;
 using Riskeer.Piping.Data.Probabilistic;
-using Riskeer.Piping.Data.SemiProbabilistic;
 
 namespace Riskeer.Piping.Data.Test.Probabilistic
 {
@@ -35,7 +34,7 @@
             var calculation = new ProbabilisticPipingCalculation(new GeneralPipingInput());
 
             // Assert
-            Assert.IsInstanceOf<PipingCalculation<ProbabilisticPipingInput, SemiProbabilisticPipingOutput>>(calculation);
+            Assert.IsInstanceOf<PipingCalculation<ProbabilisticPipingInput>>(calculation);
             Assert.IsInstanceOf<ProbabilisticPipingInput>(calculation.InputParameters);
 
             Assert.IsNull(calculation.Output);
Index: Riskeer/Piping/test/Riskeer.Piping.Data.Test/SemiProbabilistic/SemiProbabilisticPipingCalculationTest.cs
===================================================================
diff -u -r503de68118b2702bb62004782f1c39271cb2eb29 -r20e7e6fa8aa7f33ace3cf0bee9dc3ce2fc4015c1
--- Riskeer/Piping/test/Riskeer.Piping.Data.Test/SemiProbabilistic/SemiProbabilisticPipingCalculationTest.cs	(.../SemiProbabilisticPipingCalculationTest.cs)	(revision 503de68118b2702bb62004782f1c39271cb2eb29)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.Test/SemiProbabilistic/SemiProbabilisticPipingCalculationTest.cs	(.../SemiProbabilisticPipingCalculationTest.cs)	(revision 20e7e6fa8aa7f33ace3cf0bee9dc3ce2fc4015c1)
@@ -35,7 +35,7 @@
             var calculation = new SemiProbabilisticPipingCalculation(new GeneralPipingInput());
 
             // Assert
-            Assert.IsInstanceOf<PipingCalculation<SemiProbabilisticPipingInput, SemiProbabilisticPipingOutput>>(calculation);
+            Assert.IsInstanceOf<PipingCalculation<SemiProbabilisticPipingInput>>(calculation);
             Assert.IsInstanceOf<SemiProbabilisticPipingInput>(calculation.InputParameters);
 
             Assert.IsNull(calculation.Output);
Index: Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/TestPipingCalculation.cs
===================================================================
diff -u -rc2f92cc6160aebf4030923e296c0085b66ce4270 -r20e7e6fa8aa7f33ace3cf0bee9dc3ce2fc4015c1
--- Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/TestPipingCalculation.cs	(.../TestPipingCalculation.cs)	(revision c2f92cc6160aebf4030923e296c0085b66ce4270)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/TestPipingCalculation.cs	(.../TestPipingCalculation.cs)	(revision 20e7e6fa8aa7f33ace3cf0bee9dc3ce2fc4015c1)
@@ -20,14 +20,13 @@
 // All rights reserved.
 
 using System;
-using Riskeer.Piping.Data.SemiProbabilistic;
 
 namespace Riskeer.Piping.Data.TestUtil
 {
     /// <summary>
     /// Piping calculation that can be used for testing.
     /// </summary>
-    public class TestPipingCalculation : PipingCalculation<PipingInput, SemiProbabilisticPipingOutput>
+    public class TestPipingCalculation : PipingCalculation<PipingInput>
     {
         private bool hasOutput;