Index: Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/PipingCalculationsProperties.cs
===================================================================
diff -u -r28973d5db2f3d49159afa2b6d547cc712d767f4c -r8d3a454f1081eb57aff61cab26ad9c856af107c7
--- Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/PipingCalculationsProperties.cs	(.../PipingCalculationsProperties.cs)	(revision 28973d5db2f3d49159afa2b6d547cc712d767f4c)
+++ Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/PipingCalculationsProperties.cs	(.../PipingCalculationsProperties.cs)	(revision 8d3a454f1081eb57aff61cab26ad9c856af107c7)
@@ -41,18 +41,17 @@
     {
         private const int namePropertyIndex = 1;
         private const int codePropertyIndex = 2;
-        private const int groupPropertyIndex = 3;
-        private const int waterVolumetricWeightPropertyIndex = 4;
-        private const int upLiftModelFactorPropertyIndex = 5;
-        private const int sellmeijerModelFactorPropertyIndex = 6;
-        private const int criticalHeaveGradientPropertyIndex = 7;
-        private const int sandParticlesVolumetricWeightPropertyIndex = 8;
-        private const int whitesDragCoefficientPropertyIndex = 9;
-        private const int beddingAnglePropertyIndex = 10;
-        private const int waterKinematicViscosityPropertyIndex = 11;
-        private const int gravityPropertyIndex = 12;
-        private const int meanDiameter70PropertyIndex = 13;
-        private const int sellmeijerReductionFactorPropertyIndex = 14;
+        private const int waterVolumetricWeightPropertyIndex = 3;
+        private const int upLiftModelFactorPropertyIndex = 4;
+        private const int sellmeijerModelFactorPropertyIndex = 5;
+        private const int criticalHeaveGradientPropertyIndex = 6;
+        private const int sandParticlesVolumetricWeightPropertyIndex = 7;
+        private const int whitesDragCoefficientPropertyIndex = 8;
+        private const int beddingAnglePropertyIndex = 9;
+        private const int waterKinematicViscosityPropertyIndex = 10;
+        private const int gravityPropertyIndex = 11;
+        private const int meanDiameter70PropertyIndex = 12;
+        private const int sellmeijerReductionFactorPropertyIndex = 13;
 
         private readonly IFailureMechanismPropertyChangeHandler<PipingFailureMechanism> propertyChangeHandler;
 
@@ -66,8 +65,7 @@
                                             IFailureMechanismPropertyChangeHandler<PipingFailureMechanism> handler) : base(data, new ConstructionProperties
         {
             NamePropertyIndex = namePropertyIndex,
-            CodePropertyIndex = codePropertyIndex,
-            GroupPropertyIndex = groupPropertyIndex
+            CodePropertyIndex = codePropertyIndex
         })
         {
             if (handler == null)
Index: Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/PipingFailureMechanismProperties.cs
===================================================================
diff -u -r1d672e197d1bb727635a2f24f466055dfe33b16a -r8d3a454f1081eb57aff61cab26ad9c856af107c7
--- Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/PipingFailureMechanismProperties.cs	(.../PipingFailureMechanismProperties.cs)	(revision 1d672e197d1bb727635a2f24f466055dfe33b16a)
+++ Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/PipingFailureMechanismProperties.cs	(.../PipingFailureMechanismProperties.cs)	(revision 8d3a454f1081eb57aff61cab26ad9c856af107c7)
@@ -93,11 +93,6 @@
             /// </summary>
             public int CodePropertyIndex { get; set; }
 
-            /// <summary>
-            /// Gets or sets the property index for <see cref="PipingFailureMechanismProperties.Group"/>.
-            /// </summary>
-            public int GroupPropertyIndex { get; set; }
-
             #endregion
         }
 
Index: Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/PipingFailurePathProperties.cs
===================================================================
diff -u -r1d672e197d1bb727635a2f24f466055dfe33b16a -r8d3a454f1081eb57aff61cab26ad9c856af107c7
--- Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/PipingFailurePathProperties.cs	(.../PipingFailurePathProperties.cs)	(revision 1d672e197d1bb727635a2f24f466055dfe33b16a)
+++ Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/PipingFailurePathProperties.cs	(.../PipingFailurePathProperties.cs)	(revision 8d3a454f1081eb57aff61cab26ad9c856af107c7)
@@ -58,8 +58,7 @@
             base(data, new ConstructionProperties
             {
                 NamePropertyIndex = namePropertyIndex,
-                CodePropertyIndex = codePropertyIndex,
-                GroupPropertyIndex = groupPropertyIndex
+                CodePropertyIndex = codePropertyIndex
             })
         {
             if (assessmentSection == null)