Index: Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/PipingCalculator.cs
===================================================================
diff -u -r845fd279735c2917659ea5e03a4b6da3e5afd92d -r7b503435cfa703797c85458fe2130f6f2ae75b1a
--- Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/PipingCalculator.cs	(.../PipingCalculator.cs)	(revision 845fd279735c2917659ea5e03a4b6da3e5afd92d)
+++ Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/PipingCalculator.cs	(.../PipingCalculator.cs)	(revision 7b503435cfa703797c85458fe2130f6f2ae75b1a)
@@ -77,11 +77,8 @@
 
             return new PipingCalculatorResult(new PipingCalculatorResult.ConstructionProperties
             {
-                UpliftZValue = upliftResult.Zu,
                 UpliftFactorOfSafety = upliftResult.FoSu,
-                HeaveZValue = heaveResult.Zh,
                 HeaveFactorOfSafety = heaveResult.FoSh,
-                SellmeijerZValue = sellmeijerResult.Zp,
                 SellmeijerFactorOfSafety = sellmeijerResult.FoSp,
                 UpliftEffectiveStress = upliftResult.EffectiveStress,
                 HeaveGradient = heaveResult.Gradient,
Index: Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/PipingCalculatorResult.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r7b503435cfa703797c85458fe2130f6f2ae75b1a
--- Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/PipingCalculatorResult.cs	(.../PipingCalculatorResult.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/PipingCalculatorResult.cs	(.../PipingCalculatorResult.cs)	(revision 7b503435cfa703797c85458fe2130f6f2ae75b1a)
@@ -42,11 +42,8 @@
                 throw new ArgumentNullException(nameof(constructionProperties));
             }
 
-            UpliftZValue = constructionProperties.UpliftZValue;
             UpliftFactorOfSafety = constructionProperties.UpliftFactorOfSafety;
-            HeaveZValue = constructionProperties.HeaveZValue;
             HeaveFactorOfSafety = constructionProperties.HeaveFactorOfSafety;
-            SellmeijerZValue = constructionProperties.SellmeijerZValue;
             SellmeijerFactorOfSafety = constructionProperties.SellmeijerFactorOfSafety;
             UpliftEffectiveStress = constructionProperties.UpliftEffectiveStress;
             HeaveGradient = constructionProperties.HeaveGradient;
@@ -65,11 +62,8 @@
             /// </summary>
             public ConstructionProperties()
             {
-                UpliftZValue = double.NaN;
                 UpliftFactorOfSafety = double.NaN;
-                HeaveZValue = double.NaN;
                 HeaveFactorOfSafety = double.NaN;
-                SellmeijerZValue = double.NaN;
                 SellmeijerFactorOfSafety = double.NaN;
                 UpliftEffectiveStress = double.NaN;
                 HeaveGradient = double.NaN;
@@ -79,31 +73,16 @@
             }
 
             /// <summary>
-            /// Sets the z-value of the Uplift sub calculation.
-            /// </summary>
-            public double UpliftZValue { internal get; set; }
-
-            /// <summary>
             /// Sets the factor of safety of the Uplift sub calculation.
             /// </summary>
             public double UpliftFactorOfSafety { internal get; set; }
-
+            
             /// <summary>
-            /// Sets the z-value of the Heave sub calculation.
-            /// </summary>
-            public double HeaveZValue { internal get; set; }
-
-            /// <summary>
             /// Sets the factor of safety of the Heave sub calculation.
             /// </summary>
             public double HeaveFactorOfSafety { internal get; set; }
-
+            
             /// <summary>
-            /// Sets the z-value of the Sellmeijer sub calculation.
-            /// </summary>
-            public double SellmeijerZValue { internal get; set; }
-
-            /// <summary>
             /// Sets the factor of safety of the Sellmeijer sub calculation.
             /// </summary>
             public double SellmeijerFactorOfSafety { internal get; set; }
@@ -135,33 +114,18 @@
         }
 
         #region Properties
-
+        
         /// <summary>
-        /// Gets the z-value of the Uplift sub calculation.
-        /// </summary>
-        public double UpliftZValue { get; }
-
-        /// <summary>
         /// Gets the factor of safety of the Uplift sub calculation.
         /// </summary>
         public double UpliftFactorOfSafety { get; }
-
+        
         /// <summary>
-        /// Gets the z-value of the Heave sub calculation.
-        /// </summary>
-        public double HeaveZValue { get; }
-
-        /// <summary>
         /// Gets the factor of safety of the Heave sub calculation.
         /// </summary>
         public double HeaveFactorOfSafety { get; }
-
+        
         /// <summary>
-        /// Gets the z-value of the Sellmeijer sub calculation.
-        /// </summary>
-        public double SellmeijerZValue { get; }
-
-        /// <summary>
         /// Gets the factor of safety of the Sellmeijer sub calculation.
         /// </summary>
         public double SellmeijerFactorOfSafety { get; }
Index: Riskeer/Piping/src/Riskeer.Piping.Service/PipingCalculationService.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r7b503435cfa703797c85458fe2130f6f2ae75b1a
--- Riskeer/Piping/src/Riskeer.Piping.Service/PipingCalculationService.cs	(.../PipingCalculationService.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/Piping/src/Riskeer.Piping.Service/PipingCalculationService.cs	(.../PipingCalculationService.cs)	(revision 7b503435cfa703797c85458fe2130f6f2ae75b1a)
@@ -105,11 +105,8 @@
 
                 calculation.Output = new PipingOutput(new PipingOutput.ConstructionProperties
                 {
-                    UpliftZValue = pipingResult.UpliftZValue,
                     UpliftFactorOfSafety = pipingResult.UpliftFactorOfSafety,
-                    HeaveZValue = pipingResult.HeaveZValue,
                     HeaveFactorOfSafety = pipingResult.HeaveFactorOfSafety,
-                    SellmeijerZValue = pipingResult.SellmeijerZValue,
                     SellmeijerFactorOfSafety = pipingResult.SellmeijerFactorOfSafety,
                     UpliftEffectiveStress = pipingResult.UpliftEffectiveStress,
                     HeaveGradient = pipingResult.HeaveGradient,
Index: Riskeer/Piping/test/Riskeer.Piping.KernelWrapper.Test/PipingCalculatorResultTest.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r7b503435cfa703797c85458fe2130f6f2ae75b1a
--- Riskeer/Piping/test/Riskeer.Piping.KernelWrapper.Test/PipingCalculatorResultTest.cs	(.../PipingCalculatorResultTest.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/Piping/test/Riskeer.Piping.KernelWrapper.Test/PipingCalculatorResultTest.cs	(.../PipingCalculatorResultTest.cs)	(revision 7b503435cfa703797c85458fe2130f6f2ae75b1a)
@@ -31,11 +31,11 @@
         public void Constructor_WithoutConstructionProperties_ThrowsArgumentNullException()
         {
             // Call
-            TestDelegate test = () => new PipingCalculatorResult(null);
+            void Call() => new PipingCalculatorResult(null);
 
             // Assert
-            string paramName = Assert.Throws<ArgumentNullException>(test).ParamName;
-            Assert.AreEqual("constructionProperties", paramName);
+            var exception = Assert.Throws<ArgumentNullException>(Call);
+            Assert.AreEqual("constructionProperties", exception.ParamName);
         }
 
         [Test]
@@ -45,11 +45,8 @@
             var actual = new PipingCalculatorResult(new PipingCalculatorResult.ConstructionProperties());
 
             // Assert
-            Assert.IsNaN(actual.UpliftZValue);
             Assert.IsNaN(actual.UpliftFactorOfSafety);
-            Assert.IsNaN(actual.HeaveZValue);
             Assert.IsNaN(actual.HeaveFactorOfSafety);
-            Assert.IsNaN(actual.SellmeijerZValue);
             Assert.IsNaN(actual.SellmeijerFactorOfSafety);
             Assert.IsNaN(actual.UpliftEffectiveStress);
             Assert.IsNaN(actual.HeaveGradient);
@@ -63,11 +60,8 @@
         {
             // Setup
             var random = new Random(22);
-            double zuValue = random.NextDouble();
             double foSuValue = random.NextDouble();
-            double zhValue = random.NextDouble();
             double foShValue = random.NextDouble();
-            double zsValue = random.NextDouble();
             double foSsValue = random.NextDouble();
             double heaveGradient = random.NextDouble();
             double upliftEffectiveStress = random.NextDouble();
@@ -77,11 +71,8 @@
 
             var constructionProperties = new PipingCalculatorResult.ConstructionProperties
             {
-                UpliftZValue = zuValue,
                 UpliftFactorOfSafety = foSuValue,
-                HeaveZValue = zhValue,
                 HeaveFactorOfSafety = foShValue,
-                SellmeijerZValue = zsValue,
                 SellmeijerFactorOfSafety = foSsValue,
                 UpliftEffectiveStress = upliftEffectiveStress,
                 HeaveGradient = heaveGradient,
@@ -94,11 +85,8 @@
             var actual = new PipingCalculatorResult(constructionProperties);
 
             // Assert
-            Assert.AreEqual(zuValue, actual.UpliftZValue);
             Assert.AreEqual(foSuValue, actual.UpliftFactorOfSafety);
-            Assert.AreEqual(zhValue, actual.HeaveZValue);
             Assert.AreEqual(foShValue, actual.HeaveFactorOfSafety);
-            Assert.AreEqual(zsValue, actual.SellmeijerZValue);
             Assert.AreEqual(foSsValue, actual.SellmeijerFactorOfSafety);
             Assert.AreEqual(upliftEffectiveStress, actual.UpliftEffectiveStress);
             Assert.AreEqual(heaveGradient, actual.HeaveGradient);
Index: Riskeer/Piping/test/Riskeer.Piping.KernelWrapper.Test/PipingCalculatorTest.cs
===================================================================
diff -u -rede79f0bab07cac1cc9405d6871e80bf940a91fe -r7b503435cfa703797c85458fe2130f6f2ae75b1a
--- Riskeer/Piping/test/Riskeer.Piping.KernelWrapper.Test/PipingCalculatorTest.cs	(.../PipingCalculatorTest.cs)	(revision ede79f0bab07cac1cc9405d6871e80bf940a91fe)
+++ Riskeer/Piping/test/Riskeer.Piping.KernelWrapper.Test/PipingCalculatorTest.cs	(.../PipingCalculatorTest.cs)	(revision 7b503435cfa703797c85458fe2130f6f2ae75b1a)
@@ -71,11 +71,8 @@
             // Assert
             Assert.IsNotNull(actual);
             Assert.IsFalse(double.IsNaN(actual.UpliftEffectiveStress));
-            Assert.IsFalse(double.IsNaN(actual.UpliftZValue));
             Assert.IsFalse(double.IsNaN(actual.UpliftFactorOfSafety));
-            Assert.IsFalse(double.IsNaN(actual.HeaveZValue));
             Assert.IsFalse(double.IsNaN(actual.HeaveFactorOfSafety));
-            Assert.IsFalse(double.IsNaN(actual.SellmeijerZValue));
             Assert.IsFalse(double.IsNaN(actual.SellmeijerFactorOfSafety));
 
             Assert.IsTrue(testPipingSubCalculatorFactory.LastCreatedHeaveCalculator.Calculated);