Index: Riskeer/Piping/src/Riskeer.Piping.Data/PipingCalculation.cs
===================================================================
diff -u -re3efd805fe694da047a4d82b1a9f1cb1616e22f1 -r99db95d0571f782a6b4945f4a48d650ebde0e687
--- Riskeer/Piping/src/Riskeer.Piping.Data/PipingCalculation.cs	(.../PipingCalculation.cs)	(revision e3efd805fe694da047a4d82b1a9f1cb1616e22f1)
+++ Riskeer/Piping/src/Riskeer.Piping.Data/PipingCalculation.cs	(.../PipingCalculation.cs)	(revision 99db95d0571f782a6b4945f4a48d650ebde0e687)
@@ -22,7 +22,6 @@
 using System;
 using Core.Common.Base;
 using Riskeer.Common.Data;
-using Riskeer.Piping.Data.SemiProbabilistic;
 using RiskeerCommonDataResources = Riskeer.Common.Data.Properties.Resources;
 
 namespace Riskeer.Piping.Data
@@ -31,13 +30,11 @@
     /// Base class that holds information about a calculation for the <see cref="PipingFailureMechanism"/>.
     /// </summary>
     /// <typeparam name="TPipingInput">The type of calculation input.</typeparam>
-    /// <typeparam name="TPipingOutput">The type of calculation output.</typeparam>
-    public abstract class PipingCalculation<TPipingInput, TPipingOutput> : CloneableObservable, IPipingCalculation<TPipingInput>
+    public abstract class PipingCalculation<TPipingInput> : CloneableObservable, IPipingCalculation<TPipingInput>
         where TPipingInput : PipingInput
-        where TPipingOutput : SemiProbabilisticPipingOutput
     {
         /// <summary>
-        /// Creates a new instance of <see cref="PipingCalculation{TPipingInput,TPipingOutput}"/> with default values set for some of
+        /// Creates a new instance of <see cref="PipingCalculation{TPipingInput}"/> with default values set for some of
         /// the parameters.
         /// </summary>
         /// <param name="pipingInput">The input parameters to perform the piping calculation with.</param>
@@ -72,7 +69,7 @@
 
         public override object Clone()
         {
-            var clone = (PipingCalculation<TPipingInput, TPipingOutput>) base.Clone();
+            var clone = (PipingCalculation<TPipingInput>) base.Clone();
 
             clone.Comments = (Comment) Comments.Clone();
             clone.InputParameters = (TPipingInput) InputParameters.Clone();
Index: Riskeer/Piping/src/Riskeer.Piping.Data/Probabilistic/ProbabilisticPipingCalculation.cs
===================================================================
diff -u -rc2f92cc6160aebf4030923e296c0085b66ce4270 -r99db95d0571f782a6b4945f4a48d650ebde0e687
--- Riskeer/Piping/src/Riskeer.Piping.Data/Probabilistic/ProbabilisticPipingCalculation.cs	(.../ProbabilisticPipingCalculation.cs)	(revision c2f92cc6160aebf4030923e296c0085b66ce4270)
+++ Riskeer/Piping/src/Riskeer.Piping.Data/Probabilistic/ProbabilisticPipingCalculation.cs	(.../ProbabilisticPipingCalculation.cs)	(revision 99db95d0571f782a6b4945f4a48d650ebde0e687)
@@ -20,14 +20,13 @@
 // All rights reserved.
 
 using System;
-using Riskeer.Piping.Data.SemiProbabilistic;
 
 namespace Riskeer.Piping.Data.Probabilistic
 {
     /// <summary>
     /// This class holds information about a probabilistic calculation for the <see cref="PipingFailureMechanism"/>.
     /// </summary>
-    public class ProbabilisticPipingCalculation : PipingCalculation<ProbabilisticPipingInput, SemiProbabilisticPipingOutput>
+    public class ProbabilisticPipingCalculation : PipingCalculation<ProbabilisticPipingInput>
     {
         /// <summary>
         /// Creates a new instance of <see cref="ProbabilisticPipingCalculation"/>.
Index: Riskeer/Piping/src/Riskeer.Piping.Data/SemiProbabilistic/SemiProbabilisticPipingCalculation.cs
===================================================================
diff -u -r503de68118b2702bb62004782f1c39271cb2eb29 -r99db95d0571f782a6b4945f4a48d650ebde0e687
--- Riskeer/Piping/src/Riskeer.Piping.Data/SemiProbabilistic/SemiProbabilisticPipingCalculation.cs	(.../SemiProbabilisticPipingCalculation.cs)	(revision 503de68118b2702bb62004782f1c39271cb2eb29)
+++ Riskeer/Piping/src/Riskeer.Piping.Data/SemiProbabilistic/SemiProbabilisticPipingCalculation.cs	(.../SemiProbabilisticPipingCalculation.cs)	(revision 99db95d0571f782a6b4945f4a48d650ebde0e687)
@@ -26,7 +26,7 @@
     /// <summary>
     /// This class holds information about a semi-probabilistic calculation for the <see cref="PipingFailureMechanism"/>.
     /// </summary>
-    public class SemiProbabilisticPipingCalculation : PipingCalculation<SemiProbabilisticPipingInput, SemiProbabilisticPipingOutput>
+    public class SemiProbabilisticPipingCalculation : PipingCalculation<SemiProbabilisticPipingInput>
     {
         /// <summary>
         /// Creates a new instance of <see cref="SemiProbabilisticPipingCalculation"/>.