Index: src/Deltares.DSoilModel.Forms/DSoilModelContext.cs
===================================================================
diff -u -r544 -r546
--- src/Deltares.DSoilModel.Forms/DSoilModelContext.cs	(.../DSoilModelContext.cs)	(revision 544)
+++ src/Deltares.DSoilModel.Forms/DSoilModelContext.cs	(.../DSoilModelContext.cs)	(revision 546)
@@ -339,24 +339,6 @@
                         return false;
                     }
                 }
-                if (member == soil.GetMemberName(s => s.Cohesion) ||
-                    member == soil.GetMemberName(s => s.FrictionAngle))
-                {
-                    return soil.ShearStrengthModel == ShearStrengthModel.CPhi;
-                }
-                if (member == soil.GetMemberName(s => s.UsePop))
-                {
-                    return (soil.ShearStrengthModel == ShearStrengthModel.CuCalculated);
-                }
-                if (member == soil.GetMemberName(s => s.POP) ||
-                    member == soil.GetMemberName(s => s.RatioCuPc) ||
-                    member == soil.GetMemberName(s => s.StrengthIncreaseExponent))
-                {
-                    if (soil.ShearStrengthModel != ShearStrengthModel.CuCalculated)
-                    {
-                        return false;
-                    }
-                }
             }
 
             var grid = source as GridViewControl;
Index: src/Deltares.DSoilModel.Forms.Tests/DSoilModelContextTest.cs
===================================================================
diff -u -r545 -r546
--- src/Deltares.DSoilModel.Forms.Tests/DSoilModelContextTest.cs	(.../DSoilModelContextTest.cs)	(revision 545)
+++ src/Deltares.DSoilModel.Forms.Tests/DSoilModelContextTest.cs	(.../DSoilModelContextTest.cs)	(revision 546)
@@ -172,17 +172,17 @@
                 UseDefaultShearStrengthModel = false, // or it will mess up this test !
 
             };
-            Assert.AreEqual(true, context.IsEnabled(soil, soil.GetMemberName(s => s.Cohesion)));
-            Assert.AreEqual(true, context.IsEnabled(soil, soil.GetMemberName(s => s.FrictionAngle)));
-            Assert.AreEqual(false, context.IsEnabled(soil, soil.GetMemberName(s => s.UsePop)));
-            Assert.AreEqual(false, context.IsEnabled(soil, soil.GetMemberName(s => s.POP)));
+            Assert.IsNull(context.IsEnabled(soil, soil.GetMemberName(s => s.Cohesion)));
+            Assert.IsNull(context.IsEnabled(soil, soil.GetMemberName(s => s.FrictionAngle)));
+            Assert.IsNull(context.IsEnabled(soil, soil.GetMemberName(s => s.UsePop)));
+            Assert.AreEqual(true, context.IsEnabled(soil, soil.GetMemberName(s => s.POP)));
             Assert.AreEqual(false, context.IsEnabled(soil, soil.GetMemberName(s => s.RatioCuPc)));
             Assert.AreEqual(false, context.IsEnabled(soil, soil.GetMemberName(s => s.StrengthIncreaseExponent)));
 
             soil.ShearStrengthModel = ShearStrengthModel.CuCalculated;
-            Assert.AreEqual(false, context.IsEnabled(soil, soil.GetMemberName(s => s.Cohesion)));
-            Assert.AreEqual(false, context.IsEnabled(soil, soil.GetMemberName(s => s.FrictionAngle)));
-            Assert.AreEqual(true, context.IsEnabled(soil, soil.GetMemberName(s => s.UsePop)));
+            Assert.IsNull(context.IsEnabled(soil, soil.GetMemberName(s => s.Cohesion)));
+            Assert.IsNull(context.IsEnabled(soil, soil.GetMemberName(s => s.FrictionAngle)));
+            Assert.IsNull(context.IsEnabled(soil, soil.GetMemberName(s => s.UsePop)));
             soil.UsePop = true;
             Assert.AreEqual(true, context.IsEnabled(soil, soil.GetMemberName(s => s.POP)));
             Assert.AreEqual(false, context.IsEnabled(soil, soil.GetMemberName(s => s.RatioCuPc)));