Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/PropertyClasses/DuneErosionFailureMechanismProperties.cs
===================================================================
diff -u -r0ab978fb52863fc66483fbcd81ebe429b9eac955 -r07035397a147d5bd4e3241493a523fe6d15a5e1e
--- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/PropertyClasses/DuneErosionFailureMechanismProperties.cs	(.../DuneErosionFailureMechanismProperties.cs)	(revision 0ab978fb52863fc66483fbcd81ebe429b9eac955)
+++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/PropertyClasses/DuneErosionFailureMechanismProperties.cs	(.../DuneErosionFailureMechanismProperties.cs)	(revision 07035397a147d5bd4e3241493a523fe6d15a5e1e)
@@ -64,9 +64,6 @@
                 },
                 {
                     nameof(Code), constructionProperties.CodePropertyIndex
-                },
-                {
-                    nameof(Group), constructionProperties.GroupPropertyIndex
                 }
             };
         }
@@ -96,11 +93,6 @@
             /// </summary>
             public int CodePropertyIndex { get; set; }
 
-            /// <summary>
-            /// Gets or sets the property index for <see cref="DuneErosionFailureMechanismProperties.Group"/>.
-            /// </summary>
-            public int GroupPropertyIndex { get; set; }
-
             #endregion
         }
 
@@ -130,18 +122,6 @@
             }
         }
 
-        [DynamicPropertyOrder]
-        [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_General))]
-        [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_Group_DisplayName))]
-        [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_Group_Description))]
-        public int Group
-        {
-            get
-            {
-                return data.Group;
-            }
-        }
-
         #endregion
     }
 }
\ No newline at end of file
Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/PropertyClasses/DuneErosionFailurePathProperties.cs
===================================================================
diff -u -r2232ff8b2af8d6a7a9005b2f2e0566ebcba2b1e9 -r07035397a147d5bd4e3241493a523fe6d15a5e1e
--- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/PropertyClasses/DuneErosionFailurePathProperties.cs	(.../DuneErosionFailurePathProperties.cs)	(revision 2232ff8b2af8d6a7a9005b2f2e0566ebcba2b1e9)
+++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/PropertyClasses/DuneErosionFailurePathProperties.cs	(.../DuneErosionFailurePathProperties.cs)	(revision 07035397a147d5bd4e3241493a523fe6d15a5e1e)
@@ -49,39 +49,9 @@
             : base(data, new ConstructionProperties
             {
                 NamePropertyIndex = namePropertyIndex,
-                CodePropertyIndex = codePropertyIndex,
-                GroupPropertyIndex = groupPropertyIndex
+                CodePropertyIndex = codePropertyIndex
             }) {}
 
-        #region General
-
-        [PropertyOrder(inAssemblyPropertyIndex)]
-        [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_General))]
-        [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_InAssembly_DisplayName))]
-        [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_InAssembly_Description))]
-        public bool InAssembly
-        {
-            get
-            {
-                return data.InAssembly;
-            }
-        }
-        
-        [DynamicVisible]
-        [PropertyOrder(contributionPropertyIndex)]
-        [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_General))]
-        [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_Contribution_DisplayName))]
-        [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_Contribution_Description))]
-        public double Contribution
-        {
-            get
-            {
-                return data.Contribution;
-            }
-        }
-
-        #endregion
-
         #region Length effect parameters
 
         [DynamicVisible]
@@ -115,5 +85,46 @@
             return nameof(Contribution).Equals(propertyName)
                    || nameof(N).Equals(propertyName);
         }
+
+        #region General
+
+        [PropertyOrder(groupPropertyIndex)]
+        [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_General))]
+        [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_Group_DisplayName))]
+        [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_Group_Description))]
+        public int Group
+        {
+            get
+            {
+                return data.Group;
+            }
+        }
+
+        [PropertyOrder(inAssemblyPropertyIndex)]
+        [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_General))]
+        [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_InAssembly_DisplayName))]
+        [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_InAssembly_Description))]
+        public bool InAssembly
+        {
+            get
+            {
+                return data.InAssembly;
+            }
+        }
+
+        [DynamicVisible]
+        [PropertyOrder(contributionPropertyIndex)]
+        [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_General))]
+        [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_Contribution_DisplayName))]
+        [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_Contribution_Description))]
+        public double Contribution
+        {
+            get
+            {
+                return data.Contribution;
+            }
+        }
+
+        #endregion
     }
 }
\ No newline at end of file
Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/PropertyClasses/DuneErosionHydraulicLoadsProperties.cs
===================================================================
diff -u -r0ab978fb52863fc66483fbcd81ebe429b9eac955 -r07035397a147d5bd4e3241493a523fe6d15a5e1e
--- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/PropertyClasses/DuneErosionHydraulicLoadsProperties.cs	(.../DuneErosionHydraulicLoadsProperties.cs)	(revision 0ab978fb52863fc66483fbcd81ebe429b9eac955)
+++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/PropertyClasses/DuneErosionHydraulicLoadsProperties.cs	(.../DuneErosionHydraulicLoadsProperties.cs)	(revision 07035397a147d5bd4e3241493a523fe6d15a5e1e)
@@ -31,7 +31,6 @@
     {
         private const int namePropertyIndex = 1;
         private const int codePropertyIndex = 2;
-        private const int groupPropertyIndex = 3;
 
         /// <summary>
         /// Creates a new instance of <see cref="DuneErosionHydraulicLoadsProperties"/>.
@@ -42,8 +41,7 @@
             : base(data, new ConstructionProperties
             {
                 NamePropertyIndex = namePropertyIndex,
-                CodePropertyIndex = codePropertyIndex,
-                GroupPropertyIndex = groupPropertyIndex
+                CodePropertyIndex = codePropertyIndex
             }) {}
     }
 }
\ No newline at end of file
Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/PropertyClasses/DuneErosionFailureMechanismPropertiesTest.cs
===================================================================
diff -u -r0ab978fb52863fc66483fbcd81ebe429b9eac955 -r07035397a147d5bd4e3241493a523fe6d15a5e1e
--- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/PropertyClasses/DuneErosionFailureMechanismPropertiesTest.cs	(.../DuneErosionFailureMechanismPropertiesTest.cs)	(revision 0ab978fb52863fc66483fbcd81ebe429b9eac955)
+++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/PropertyClasses/DuneErosionFailureMechanismPropertiesTest.cs	(.../DuneErosionFailureMechanismPropertiesTest.cs)	(revision 07035397a147d5bd4e3241493a523fe6d15a5e1e)
@@ -32,9 +32,8 @@
     [TestFixture]
     public class DuneErosionFailureMechanismPropertiesTest
     {
-        private const int namePropertyIndex = 0;
-        private const int codePropertyIndex = 1;
-        private const int groupPropertyIndex = 2;
+        private const int namePropertyIndex = 1;
+        private const int codePropertyIndex = 0;
 
         [Test]
         public void Constructor_DataNull_ThrowArgumentNullException()
@@ -75,7 +74,6 @@
             Assert.AreSame(failureMechanism, properties.Data);
             Assert.AreEqual(failureMechanism.Name, properties.Name);
             Assert.AreEqual(failureMechanism.Code, properties.Code);
-            Assert.AreEqual(failureMechanism.Group, properties.Group);
         }
 
         [Test]
@@ -88,13 +86,12 @@
             var properties = new DuneErosionFailureMechanismProperties(failureMechanism, new DuneErosionFailureMechanismProperties.ConstructionProperties
             {
                 NamePropertyIndex = namePropertyIndex,
-                CodePropertyIndex = codePropertyIndex,
-                GroupPropertyIndex = groupPropertyIndex
+                CodePropertyIndex = codePropertyIndex
             });
 
             // Assert
             PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties);
-            Assert.AreEqual(3, dynamicProperties.Count);
+            Assert.AreEqual(2, dynamicProperties.Count);
 
             const string generalCategory = "Algemeen";
 
@@ -111,13 +108,6 @@
                                                                             "Label",
                                                                             "Het label van het toetsspoor.",
                                                                             true);
-
-            PropertyDescriptor groupProperty = dynamicProperties[groupPropertyIndex];
-            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(groupProperty,
-                                                                            generalCategory,
-                                                                            "Groep",
-                                                                            "De groep waar het toetsspoor toe behoort.",
-                                                                            true);
         }
     }
 }
\ No newline at end of file
Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/PropertyClasses/DuneErosionHydraulicLoadsPropertiesTest.cs
===================================================================
diff -u -r0ab978fb52863fc66483fbcd81ebe429b9eac955 -r07035397a147d5bd4e3241493a523fe6d15a5e1e
--- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/PropertyClasses/DuneErosionHydraulicLoadsPropertiesTest.cs	(.../DuneErosionHydraulicLoadsPropertiesTest.cs)	(revision 0ab978fb52863fc66483fbcd81ebe429b9eac955)
+++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/PropertyClasses/DuneErosionHydraulicLoadsPropertiesTest.cs	(.../DuneErosionHydraulicLoadsPropertiesTest.cs)	(revision 07035397a147d5bd4e3241493a523fe6d15a5e1e)
@@ -32,7 +32,6 @@
     {
         private const int namePropertyIndex = 0;
         private const int codePropertyIndex = 1;
-        private const int groupPropertyIndex = 2;
 
         [Test]
         public void Constructor_ExpectedValues()
@@ -48,7 +47,6 @@
             Assert.AreSame(failureMechanism, properties.Data);
             Assert.AreEqual(failureMechanism.Name, properties.Name);
             Assert.AreEqual(failureMechanism.Code, properties.Code);
-            Assert.AreEqual(failureMechanism.Group, properties.Group);
         }
 
         [Test]
@@ -62,7 +60,7 @@
 
             // Assert
             PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties);
-            Assert.AreEqual(3, dynamicProperties.Count);
+            Assert.AreEqual(2, dynamicProperties.Count);
 
             const string generalCategory = "Algemeen";
 
@@ -79,13 +77,6 @@
                                                                             "Label",
                                                                             "Het label van het toetsspoor.",
                                                                             true);
-
-            PropertyDescriptor groupProperty = dynamicProperties[groupPropertyIndex];
-            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(groupProperty,
-                                                                            generalCategory,
-                                                                            "Groep",
-                                                                            "De groep waar het toetsspoor toe behoort.",
-                                                                            true);
         }
     }
 }
\ No newline at end of file