Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructuresOutputPropertiesTest.cs
===================================================================
diff -u -r767fd4c880443be2882b7510b290bd690c938fdc -re3422ff344de83f9cc3331b5af2c453dd730c74d
--- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructuresOutputPropertiesTest.cs	(.../ClosingStructuresOutputPropertiesTest.cs)	(revision 767fd4c880443be2882b7510b290bd690c938fdc)
+++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructuresOutputPropertiesTest.cs	(.../ClosingStructuresOutputPropertiesTest.cs)	(revision e3422ff344de83f9cc3331b5af2c453dd730c74d)
@@ -102,11 +102,8 @@
             // Assert
             ProbabilityAssessmentOutput expectedProbabilityAssessmentOutput = ClosingStructuresProbabilityAssessmentOutputFactory.Create(
                 structuresOutput, failureMechanism, assessmentSection);
-            Assert.AreEqual(ProbabilityFormattingHelper.Format(expectedProbabilityAssessmentOutput.RequiredProbability), properties.RequiredProbability);
-            Assert.AreEqual(expectedProbabilityAssessmentOutput.RequiredReliability, properties.RequiredReliability, properties.RequiredReliability.GetAccuracy());
             Assert.AreEqual(ProbabilityFormattingHelper.Format(expectedProbabilityAssessmentOutput.Probability), properties.Probability);
             Assert.AreEqual(expectedProbabilityAssessmentOutput.Reliability, properties.Reliability, properties.Reliability.GetAccuracy());
-            Assert.AreEqual(expectedProbabilityAssessmentOutput.FactorOfSafety, properties.FactorOfSafety, properties.FactorOfSafety.GetAccuracy());
             mocks.VerifyAll();
         }
     }
Index: Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/StructuresOutputProperties.cs
===================================================================
diff -u -ref9f41ef150aee02d286c53de24660a19d948e02 -re3422ff344de83f9cc3331b5af2c453dd730c74d
--- Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/StructuresOutputProperties.cs	(.../StructuresOutputProperties.cs)	(revision ef9f41ef150aee02d286c53de24660a19d948e02)
+++ Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/StructuresOutputProperties.cs	(.../StructuresOutputProperties.cs)	(revision e3422ff344de83f9cc3331b5af2c453dd730c74d)
@@ -122,30 +122,6 @@
 
         [PropertyOrder(1)]
         [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Result), 1, 2)]
-        [ResourcesDisplayName(typeof(Resources), nameof(Resources.ProbabilityAssessmentOutput_RequiredProbability_Displayname))]
-        [ResourcesDescription(typeof(Resources), nameof(Resources.ProbabilityAssessmentOutput_RequiredProbability_Description))]
-        public string RequiredProbability
-        {
-            get
-            {
-                return ProbabilityFormattingHelper.Format(DerivedOutput.RequiredProbability);
-            }
-        }
-
-        [PropertyOrder(2)]
-        [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Result), 1, 2)]
-        [ResourcesDisplayName(typeof(Resources), nameof(Resources.ProbabilityAssessmentOutput_RequiredReliability_Displayname))]
-        [ResourcesDescription(typeof(Resources), nameof(Resources.ProbabilityAssessmentOutput_RequiredReliability_Description))]
-        public RoundedDouble RequiredReliability
-        {
-            get
-            {
-                return DerivedOutput.RequiredReliability;
-            }
-        }
-
-        [PropertyOrder(3)]
-        [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Result), 1, 2)]
         [ResourcesDisplayName(typeof(Resources), nameof(Resources.ProbabilityAssessmentOutput_Probability_Displayname))]
         [ResourcesDescription(typeof(Resources), nameof(Resources.ProbabilityAssessmentOutput_Probability_Description))]
         public string Probability
@@ -156,7 +132,7 @@
             }
         }
 
-        [PropertyOrder(4)]
+        [PropertyOrder(2)]
         [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Result), 1, 2)]
         [ResourcesDisplayName(typeof(Resources), nameof(Resources.ProbabilityAssessmentOutput_Reliability_Displayname))]
         [ResourcesDescription(typeof(Resources), nameof(Resources.ProbabilityAssessmentOutput_Reliability_Description))]
@@ -168,18 +144,6 @@
             }
         }
 
-        [PropertyOrder(5)]
-        [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Result), 1, 2)]
-        [ResourcesDisplayName(typeof(Resources), nameof(Resources.ProbabilityAssessmentOutput_FactorOfSafety_Displayname))]
-        [ResourcesDescription(typeof(Resources), nameof(Resources.ProbabilityAssessmentOutput_FactorOfSafety_Description))]
-        public RoundedDouble FactorOfSafety
-        {
-            get
-            {
-                return DerivedOutput.FactorOfSafety;
-            }
-        }
-
         [DynamicVisibleValidationMethod]
         public bool DynamicVisibleValidationMethod(string propertyName)
         {
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/PropertyClasses/StructuresOutputPropertiesTest.cs
===================================================================
diff -u -r1cbbb2310c2dd1270825700be09b51c5f321cfd2 -re3422ff344de83f9cc3331b5af2c453dd730c74d
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/PropertyClasses/StructuresOutputPropertiesTest.cs	(.../StructuresOutputPropertiesTest.cs)	(revision 1cbbb2310c2dd1270825700be09b51c5f321cfd2)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/PropertyClasses/StructuresOutputPropertiesTest.cs	(.../StructuresOutputPropertiesTest.cs)	(revision e3422ff344de83f9cc3331b5af2c453dd730c74d)
@@ -39,15 +39,12 @@
     [TestFixture]
     public class StructuresOutputPropertiesTest
     {
-        private const int requiredProbabilityPropertyIndex = 0;
-        private const int requiredReliabilityPropertyIndex = 1;
-        private const int probabilityPropertyIndex = 2;
-        private const int reliabilityPropertyIndex = 3;
-        private const int factorOfSafetyPropertyIndex = 4;
-        private const int windDirectionPropertyIndex = 5;
-        private const int alphaValuesPropertyIndex = 6;
-        private const int durationsPropertyIndex = 7;
-        private const int illustrationPointsPropertyIndex = 8;
+        private const int probabilityPropertyIndex = 0;
+        private const int reliabilityPropertyIndex = 1;
+        private const int windDirectionPropertyIndex = 2;
+        private const int alphaValuesPropertyIndex = 3;
+        private const int durationsPropertyIndex = 4;
+        private const int illustrationPointsPropertyIndex = 5;
 
         private const string illustrationPointsCategoryName = "Illustratiepunten";
         private const string resultCategoryName = "\tResultaat";
@@ -137,22 +134,8 @@
 
             // Assert
             PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties);
-            Assert.AreEqual(9, dynamicProperties.Count);
+            Assert.AreEqual(6, dynamicProperties.Count);
 
-            PropertyDescriptor requiredProbabilityProperty = dynamicProperties[requiredProbabilityPropertyIndex];
-            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(requiredProbabilityProperty,
-                                                                            resultCategoryName,
-                                                                            "Faalkanseis [1/jaar]",
-                                                                            "De maximaal toegestane faalkanseis voor het toetsspoor.",
-                                                                            true);
-
-            PropertyDescriptor requiredReliabilityProperty = dynamicProperties[requiredReliabilityPropertyIndex];
-            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(requiredReliabilityProperty,
-                                                                            resultCategoryName,
-                                                                            "Betrouwbaarheidsindex faalkanseis [-]",
-                                                                            "De betrouwbaarheidsindex van de faalkanseis voor het toetsspoor.",
-                                                                            true);
-
             PropertyDescriptor probabilityProperty = dynamicProperties[probabilityPropertyIndex];
             PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(probabilityProperty,
                                                                             resultCategoryName,
@@ -167,13 +150,6 @@
                                                                             "De betrouwbaarheidsindex van de faalkans voor deze berekening.",
                                                                             true);
 
-            PropertyDescriptor factorOfSafetyProperty = dynamicProperties[factorOfSafetyPropertyIndex];
-            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(factorOfSafetyProperty,
-                                                                            resultCategoryName,
-                                                                            "Veiligheidsfactor [-]",
-                                                                            "De veiligheidsfactor voor deze berekening.",
-                                                                            true);
-
             PropertyDescriptor windDirectionProperty = dynamicProperties[windDirectionPropertyIndex];
             PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(windDirectionProperty,
                                                                             illustrationPointsCategoryName,
@@ -214,22 +190,8 @@
 
             // Assert
             PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties);
-            Assert.AreEqual(5, dynamicProperties.Count);
+            Assert.AreEqual(2, dynamicProperties.Count);
 
-            PropertyDescriptor requiredProbabilityProperty = dynamicProperties[requiredProbabilityPropertyIndex];
-            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(requiredProbabilityProperty,
-                                                                            resultCategoryName,
-                                                                            "Faalkanseis [1/jaar]",
-                                                                            "De maximaal toegestane faalkanseis voor het toetsspoor.",
-                                                                            true);
-
-            PropertyDescriptor requiredReliabilityProperty = dynamicProperties[requiredReliabilityPropertyIndex];
-            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(requiredReliabilityProperty,
-                                                                            resultCategoryName,
-                                                                            "Betrouwbaarheidsindex faalkanseis [-]",
-                                                                            "De betrouwbaarheidsindex van de faalkanseis voor het toetsspoor.",
-                                                                            true);
-
             PropertyDescriptor probabilityProperty = dynamicProperties[probabilityPropertyIndex];
             PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(probabilityProperty,
                                                                             resultCategoryName,
@@ -243,13 +205,6 @@
                                                                             "Betrouwbaarheidsindex faalkans [-]",
                                                                             "De betrouwbaarheidsindex van de faalkans voor deze berekening.",
                                                                             true);
-
-            PropertyDescriptor factorOfSafetyProperty = dynamicProperties[factorOfSafetyPropertyIndex];
-            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(factorOfSafetyProperty,
-                                                                            resultCategoryName,
-                                                                            "Veiligheidsfactor [-]",
-                                                                            "De veiligheidsfactor voor deze berekening.",
-                                                                            true);
         }
 
         private class SimpleStructuresOutputProperties : StructuresOutputProperties
Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresOutputPropertiesTest.cs
===================================================================
diff -u -r35349144a21f4e3627505605840f286b21b2d004 -re3422ff344de83f9cc3331b5af2c453dd730c74d
--- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresOutputPropertiesTest.cs	(.../HeightStructuresOutputPropertiesTest.cs)	(revision 35349144a21f4e3627505605840f286b21b2d004)
+++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresOutputPropertiesTest.cs	(.../HeightStructuresOutputPropertiesTest.cs)	(revision e3422ff344de83f9cc3331b5af2c453dd730c74d)
@@ -104,11 +104,8 @@
             // Assert
             ProbabilityAssessmentOutput expectedProbabilityAssessmentOutput = HeightStructuresProbabilityAssessmentOutputFactory.Create(
                 structuresOutput, failureMechanism, assessmentSection);
-            Assert.AreEqual(ProbabilityFormattingHelper.Format(expectedProbabilityAssessmentOutput.RequiredProbability), properties.RequiredProbability);
-            Assert.AreEqual(expectedProbabilityAssessmentOutput.RequiredReliability, properties.RequiredReliability, properties.RequiredReliability.GetAccuracy());
             Assert.AreEqual(ProbabilityFormattingHelper.Format(expectedProbabilityAssessmentOutput.Probability), properties.Probability);
             Assert.AreEqual(expectedProbabilityAssessmentOutput.Reliability, properties.Reliability, properties.Reliability.GetAccuracy());
-            Assert.AreEqual(expectedProbabilityAssessmentOutput.FactorOfSafety, properties.FactorOfSafety, properties.FactorOfSafety.GetAccuracy());
             mocks.VerifyAll();
         }
     }
Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructuresOutputPropertiesTest.cs
===================================================================
diff -u -r68ec97043e735b40f5f6fa555ad53ef7cc43527d -re3422ff344de83f9cc3331b5af2c453dd730c74d
--- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructuresOutputPropertiesTest.cs	(.../StabilityPointStructuresOutputPropertiesTest.cs)	(revision 68ec97043e735b40f5f6fa555ad53ef7cc43527d)
+++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructuresOutputPropertiesTest.cs	(.../StabilityPointStructuresOutputPropertiesTest.cs)	(revision e3422ff344de83f9cc3331b5af2c453dd730c74d)
@@ -104,11 +104,8 @@
             // Assert
             ProbabilityAssessmentOutput expectedProbabilityAssessmentOutput = StabilityPointStructuresProbabilityAssessmentOutputFactory.Create(
                 structuresOutput, failureMechanism, assessmentSection);
-            Assert.AreEqual(ProbabilityFormattingHelper.Format(expectedProbabilityAssessmentOutput.RequiredProbability), properties.RequiredProbability);
-            Assert.AreEqual(expectedProbabilityAssessmentOutput.RequiredReliability, properties.RequiredReliability, properties.RequiredReliability.GetAccuracy());
             Assert.AreEqual(ProbabilityFormattingHelper.Format(expectedProbabilityAssessmentOutput.Probability), properties.Probability);
             Assert.AreEqual(expectedProbabilityAssessmentOutput.Reliability, properties.Reliability, properties.Reliability.GetAccuracy());
-            Assert.AreEqual(expectedProbabilityAssessmentOutput.FactorOfSafety, properties.FactorOfSafety, properties.FactorOfSafety.GetAccuracy());
             mocks.VerifyAll();
         }
     }