Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsFailureMechanismProperties.cs
===================================================================
diff -u -r53721462b03e2de9b909eda6b07cc24a063ad525 -r34b6100f48f8dee4cc89ce5e22e388137269f1c3
--- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsFailureMechanismProperties.cs	(.../GrassCoverErosionOutwardsFailureMechanismProperties.cs)	(revision 53721462b03e2de9b909eda6b07cc24a063ad525)
+++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsFailureMechanismProperties.cs	(.../GrassCoverErosionOutwardsFailureMechanismProperties.cs)	(revision 34b6100f48f8dee4cc89ce5e22e388137269f1c3)
@@ -65,9 +65,6 @@
                 },
                 {
                     nameof(Code), constructionProperties.CodePropertyIndex
-                },
-                {
-                    nameof(Group), constructionProperties.GroupPropertyIndex
                 }
             };
         }
@@ -97,11 +94,6 @@
             /// </summary>
             public int CodePropertyIndex { get; set; }
 
-            /// <summary>
-            /// Gets or sets the property index for <see cref="GrassCoverErosionOutwardsFailureMechanismProperties.Group"/>.
-            /// </summary>
-            public int GroupPropertyIndex { get; set; }
-
             #endregion
         }
 
@@ -131,18 +123,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/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsFailurePathProperties.cs
===================================================================
diff -u -r3c1b3532f198675db6439fd52207f1d0f3d1fe1b -r34b6100f48f8dee4cc89ce5e22e388137269f1c3
--- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsFailurePathProperties.cs	(.../GrassCoverErosionOutwardsFailurePathProperties.cs)	(revision 3c1b3532f198675db6439fd52207f1d0f3d1fe1b)
+++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsFailurePathProperties.cs	(.../GrassCoverErosionOutwardsFailurePathProperties.cs)	(revision 34b6100f48f8dee4cc89ce5e22e388137269f1c3)
@@ -49,10 +49,31 @@
             : base(data, new ConstructionProperties
             {
                 NamePropertyIndex = namePropertyIndex,
-                CodePropertyIndex = codePropertyIndex,
-                GroupPropertyIndex = groupPropertyIndex
+                CodePropertyIndex = codePropertyIndex
             }) {}
-        
+
+        #region Length effect parameters
+
+        [DynamicVisible]
+        [PropertyOrder(nPropertyIndex)]
+        [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_LengthEffect))]
+        [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_N_DisplayName))]
+        [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_N_Description))]
+        public RoundedDouble N
+        {
+            get
+            {
+                return data.GeneralInput.N;
+            }
+            set
+            {
+                data.GeneralInput.N = value;
+                data.NotifyObservers();
+            }
+        }
+
+        #endregion
+
         [DynamicVisibleValidationMethod]
         public bool DynamicVisibleValidationMethod(string propertyName)
         {
@@ -72,6 +93,18 @@
 
         #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;
+            }
+        }
+
         [DynamicVisible]
         [PropertyOrder(contributionPropertyIndex)]
         [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_General))]
@@ -84,7 +117,7 @@
                 return data.Contribution;
             }
         }
-        
+
         [PropertyOrder(inAssemblyPropertyIndex)]
         [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_General))]
         [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_InAssembly_DisplayName))]
@@ -98,27 +131,5 @@
         }
 
         #endregion
-
-        #region Length effect parameters
-
-        [DynamicVisible]
-        [PropertyOrder(nPropertyIndex)]
-        [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_LengthEffect))]
-        [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_N_DisplayName))]
-        [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_N_Description))]
-        public RoundedDouble N
-        {
-            get
-            {
-                return data.GeneralInput.N;
-            }
-            set
-            {
-                data.GeneralInput.N = value;
-                data.NotifyObservers();
-            }
-        }
-
-        #endregion
     }
 }
\ No newline at end of file
Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsHydraulicLoadsProperties.cs
===================================================================
diff -u -reee2dd42910cdfaa2ecadca3702c1aba56c546d6 -r34b6100f48f8dee4cc89ce5e22e388137269f1c3
--- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsHydraulicLoadsProperties.cs	(.../GrassCoverErosionOutwardsHydraulicLoadsProperties.cs)	(revision eee2dd42910cdfaa2ecadca3702c1aba56c546d6)
+++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsHydraulicLoadsProperties.cs	(.../GrassCoverErosionOutwardsHydraulicLoadsProperties.cs)	(revision 34b6100f48f8dee4cc89ce5e22e388137269f1c3)
@@ -37,10 +37,9 @@
     {
         private const int namePropertyIndex = 1;
         private const int codePropertyIndex = 2;
-        private const int groupPropertyIndex = 3;
-        private const int waveRunUpPropertyIndex = 4;
-        private const int waveImpactPropertyIndex = 5;
-        private const int waveImpactWithWaveDirectionPropertyIndex = 6;
+        private const int waveRunUpPropertyIndex = 3;
+        private const int waveImpactPropertyIndex = 4;
+        private const int waveImpactWithWaveDirectionPropertyIndex = 5;
 
         /// <summary>
         /// Creates a new instance of <see cref="GrassCoverErosionOutwardsHydraulicLoadsProperties"/>.
@@ -51,8 +50,7 @@
             : base(data, new ConstructionProperties
             {
                 NamePropertyIndex = namePropertyIndex,
-                CodePropertyIndex = codePropertyIndex,
-                GroupPropertyIndex = groupPropertyIndex
+                CodePropertyIndex = codePropertyIndex
             }) {}
 
         #region Model settings
Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsFailureMechanismPropertiesTest.cs
===================================================================
diff -u -r53721462b03e2de9b909eda6b07cc24a063ad525 -r34b6100f48f8dee4cc89ce5e22e388137269f1c3
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsFailureMechanismPropertiesTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismPropertiesTest.cs)	(revision 53721462b03e2de9b909eda6b07cc24a063ad525)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsFailureMechanismPropertiesTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismPropertiesTest.cs)	(revision 34b6100f48f8dee4cc89ce5e22e388137269f1c3)
@@ -32,9 +32,8 @@
     [TestFixture]
     public class GrassCoverErosionOutwardsFailureMechanismPropertiesTest
     {
-        private const int namePropertyIndex = 2;
-        private const int codePropertyIndex = 1;
-        private const int groupPropertyIndex = 0;
+        private const int namePropertyIndex = 1;
+        private const int codePropertyIndex = 0;
 
         [Test]
         public void Constructor_DataNull_ThrowArgumentNullException()
@@ -71,7 +70,6 @@
             Assert.IsInstanceOf<ObjectProperties<GrassCoverErosionOutwardsFailureMechanism>>(properties);
             Assert.AreEqual(failureMechanism.Name, properties.Name);
             Assert.AreEqual(failureMechanism.Code, properties.Code);
-            Assert.AreEqual(failureMechanism.Group, properties.Group);
         }
 
         [Test]
@@ -84,13 +82,12 @@
             var properties = new GrassCoverErosionOutwardsFailureMechanismProperties(failureMechanism, new GrassCoverErosionOutwardsFailureMechanismProperties.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";
 
@@ -107,13 +104,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/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsHydraulicLoadsPropertiesTest.cs
===================================================================
diff -u -reee2dd42910cdfaa2ecadca3702c1aba56c546d6 -r34b6100f48f8dee4cc89ce5e22e388137269f1c3
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsHydraulicLoadsPropertiesTest.cs	(.../GrassCoverErosionOutwardsHydraulicLoadsPropertiesTest.cs)	(revision eee2dd42910cdfaa2ecadca3702c1aba56c546d6)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsHydraulicLoadsPropertiesTest.cs	(.../GrassCoverErosionOutwardsHydraulicLoadsPropertiesTest.cs)	(revision 34b6100f48f8dee4cc89ce5e22e388137269f1c3)
@@ -33,10 +33,9 @@
     {
         private const int namePropertyIndex = 0;
         private const int codePropertyIndex = 1;
-        private const int groupPropertyIndex = 2;
-        private const int waveRunUpPropertyIndex = 3;
-        private const int waveImpactPropertyIndex = 4;
-        private const int waveImpactWithWaveDirectionPropertyIndex = 5;
+        private const int waveRunUpPropertyIndex = 2;
+        private const int waveImpactPropertyIndex = 3;
+        private const int waveImpactWithWaveDirectionPropertyIndex = 4;
 
         [Test]
         public void Constructor_ExpectedValues()
@@ -52,7 +51,6 @@
             Assert.AreSame(failureMechanism, properties.Data);
             Assert.AreEqual(failureMechanism.Name, properties.Name);
             Assert.AreEqual(failureMechanism.Code, properties.Code);
-            Assert.AreEqual(failureMechanism.Group, properties.Group);
 
             GeneralGrassCoverErosionOutwardsInput generalInput = failureMechanism.GeneralInput;
             Assert.AreSame(generalInput.GeneralWaveRunUpWaveConditionsInput, properties.WaveRunUp.Data);
@@ -68,7 +66,7 @@
 
             // Assert
             PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties);
-            Assert.AreEqual(6, dynamicProperties.Count);
+            Assert.AreEqual(5, dynamicProperties.Count);
 
             const string generalCategory = "Algemeen";
             const string modelSettingsCategory = "Modelinstellingen";
@@ -87,13 +85,6 @@
                                                                             "Het label van het toetsspoor.",
                                                                             true);
 
-            PropertyDescriptor groupProperty = dynamicProperties[groupPropertyIndex];
-            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(groupProperty,
-                                                                            generalCategory,
-                                                                            "Groep",
-                                                                            "De groep waar het toetsspoor toe behoort.",
-                                                                            true);
-
             PropertyDescriptor waveRunUpProperty = dynamicProperties[waveRunUpPropertyIndex];
             Assert.IsInstanceOf<ExpandableObjectConverter>(waveRunUpProperty.Converter);
             PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(waveRunUpProperty,