Index: Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/SubCalculator/HeaveCalculator.cs
===================================================================
diff -u -rf8fcd3371461f6a1fa17e548f0a1e491b4b61043 -r99f7bcba69a77018c8f8b522ae44f2728e4fc729
--- Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/SubCalculator/HeaveCalculator.cs	(.../HeaveCalculator.cs)	(revision f8fcd3371461f6a1fa17e548f0a1e491b4b61043)
+++ Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/SubCalculator/HeaveCalculator.cs	(.../HeaveCalculator.cs)	(revision 99f7bcba69a77018c8f8b522ae44f2728e4fc729)
@@ -46,14 +46,6 @@
             }
         }
 
-        public double Zh
-        {
-            get
-            {
-                return wrappedCalculator.Zh;
-            }
-        }
-
         public double FoSh
         {
             get
Index: Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/SubCalculator/IHeaveCalculator.cs
===================================================================
diff -u -rede79f0bab07cac1cc9405d6871e80bf940a91fe -r99f7bcba69a77018c8f8b522ae44f2728e4fc729
--- Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/SubCalculator/IHeaveCalculator.cs	(.../IHeaveCalculator.cs)	(revision ede79f0bab07cac1cc9405d6871e80bf940a91fe)
+++ Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/SubCalculator/IHeaveCalculator.cs	(.../IHeaveCalculator.cs)	(revision 99f7bcba69a77018c8f8b522ae44f2728e4fc729)
@@ -32,13 +32,8 @@
         /// Gets the vertical outflow gradient.
         /// </summary>
         double Gradient { get; }
-
+        
         /// <summary>
-        /// Gets the z-value.
-        /// </summary>
-        double Zh { get; }
-
-        /// <summary>
         /// Gets the factor of safety.
         /// </summary>
         double FoSh { get; }
Index: Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/SubCalculator/ISellmeijerCalculator.cs
===================================================================
diff -u -rede79f0bab07cac1cc9405d6871e80bf940a91fe -r99f7bcba69a77018c8f8b522ae44f2728e4fc729
--- Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/SubCalculator/ISellmeijerCalculator.cs	(.../ISellmeijerCalculator.cs)	(revision ede79f0bab07cac1cc9405d6871e80bf940a91fe)
+++ Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/SubCalculator/ISellmeijerCalculator.cs	(.../ISellmeijerCalculator.cs)	(revision 99f7bcba69a77018c8f8b522ae44f2728e4fc729)
@@ -42,13 +42,8 @@
         /// Gets the reduced fall. 
         /// </summary>
         double ReducedFall { get; }
-
+        
         /// <summary>
-        /// Gets the z-value.
-        /// </summary>
-        double Zp { get; }
-
-        /// <summary>
         /// Gets the factor of safety.
         /// </summary>
         double FoSp { get; }
Index: Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/SubCalculator/IUpliftCalculator.cs
===================================================================
diff -u -rede79f0bab07cac1cc9405d6871e80bf940a91fe -r99f7bcba69a77018c8f8b522ae44f2728e4fc729
--- Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/SubCalculator/IUpliftCalculator.cs	(.../IUpliftCalculator.cs)	(revision ede79f0bab07cac1cc9405d6871e80bf940a91fe)
+++ Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/SubCalculator/IUpliftCalculator.cs	(.../IUpliftCalculator.cs)	(revision 99f7bcba69a77018c8f8b522ae44f2728e4fc729)
@@ -32,13 +32,8 @@
         /// Gets or sets the effective stress.
         /// </summary>
         double EffectiveStress { get; set; }
-
+        
         /// <summary>
-        /// Gets the z-value.
-        /// </summary>
-        double Zu { get; }
-
-        /// <summary>
         /// Gets the factor of safety.
         /// </summary>
         double FoSu { get; }
Index: Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/SubCalculator/SellmeijerCalculator.cs
===================================================================
diff -u -rede79f0bab07cac1cc9405d6871e80bf940a91fe -r99f7bcba69a77018c8f8b522ae44f2728e4fc729
--- Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/SubCalculator/SellmeijerCalculator.cs	(.../SellmeijerCalculator.cs)	(revision ede79f0bab07cac1cc9405d6871e80bf940a91fe)
+++ Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/SubCalculator/SellmeijerCalculator.cs	(.../SellmeijerCalculator.cs)	(revision 99f7bcba69a77018c8f8b522ae44f2728e4fc729)
@@ -63,14 +63,6 @@
             }
         }
 
-        public double Zp
-        {
-            get
-            {
-                return wrappedCalculator.Zp;
-            }
-        }
-
         public double FoSp
         {
             get
Index: Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/SubCalculator/UpliftCalculator.cs
===================================================================
diff -u -rede79f0bab07cac1cc9405d6871e80bf940a91fe -r99f7bcba69a77018c8f8b522ae44f2728e4fc729
--- Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/SubCalculator/UpliftCalculator.cs	(.../UpliftCalculator.cs)	(revision ede79f0bab07cac1cc9405d6871e80bf940a91fe)
+++ Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/SubCalculator/UpliftCalculator.cs	(.../UpliftCalculator.cs)	(revision 99f7bcba69a77018c8f8b522ae44f2728e4fc729)
@@ -51,14 +51,6 @@
             }
         }
 
-        public double Zu
-        {
-            get
-            {
-                return wrappedCalculator.Zu;
-            }
-        }
-
         public double FoSu
         {
             get
Index: Riskeer/Piping/test/Riskeer.Piping.KernelWrapper.Test/SubCalculator/HeaveCalculatorTest.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r99f7bcba69a77018c8f8b522ae44f2728e4fc729
--- Riskeer/Piping/test/Riskeer.Piping.KernelWrapper.Test/SubCalculator/HeaveCalculatorTest.cs	(.../HeaveCalculatorTest.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/Piping/test/Riskeer.Piping.KernelWrapper.Test/SubCalculator/HeaveCalculatorTest.cs	(.../HeaveCalculatorTest.cs)	(revision 99f7bcba69a77018c8f8b522ae44f2728e4fc729)
@@ -35,7 +35,6 @@
 
             // Assert
             Assert.IsInstanceOf<IHeaveCalculator>(calculator);
-            Assert.AreEqual(0.0, calculator.Zh);
             Assert.AreEqual(0.0, calculator.FoSh);
         }
     }
Index: Riskeer/Piping/test/Riskeer.Piping.KernelWrapper.Test/SubCalculator/SellmeijerCalculatorTest.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r99f7bcba69a77018c8f8b522ae44f2728e4fc729
--- Riskeer/Piping/test/Riskeer.Piping.KernelWrapper.Test/SubCalculator/SellmeijerCalculatorTest.cs	(.../SellmeijerCalculatorTest.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/Piping/test/Riskeer.Piping.KernelWrapper.Test/SubCalculator/SellmeijerCalculatorTest.cs	(.../SellmeijerCalculatorTest.cs)	(revision 99f7bcba69a77018c8f8b522ae44f2728e4fc729)
@@ -35,7 +35,6 @@
 
             // Assert
             Assert.IsInstanceOf<ISellmeijerCalculator>(calculator);
-            Assert.AreEqual(0.0, calculator.Zp);
             Assert.AreEqual(0.0, calculator.FoSp);
         }
     }
Index: Riskeer/Piping/test/Riskeer.Piping.KernelWrapper.Test/SubCalculator/UpliftCalculatorTest.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r99f7bcba69a77018c8f8b522ae44f2728e4fc729
--- Riskeer/Piping/test/Riskeer.Piping.KernelWrapper.Test/SubCalculator/UpliftCalculatorTest.cs	(.../UpliftCalculatorTest.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/Piping/test/Riskeer.Piping.KernelWrapper.Test/SubCalculator/UpliftCalculatorTest.cs	(.../UpliftCalculatorTest.cs)	(revision 99f7bcba69a77018c8f8b522ae44f2728e4fc729)
@@ -35,7 +35,6 @@
 
             // Assert
             Assert.IsInstanceOf<IUpliftCalculator>(calculator);
-            Assert.AreEqual(double.NaN, calculator.Zu);
             Assert.AreEqual(double.NaN, calculator.FoSu);
         }
     }