Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/PlLinesCreator/PlLinesCreatorTest.cs
===================================================================
diff -u -r4000 -r4023
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/PlLinesCreator/PlLinesCreatorTest.cs	(.../PlLinesCreatorTest.cs)	(revision 4000)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/PlLinesCreator/PlLinesCreatorTest.cs	(.../PlLinesCreatorTest.cs)	(revision 4023)
@@ -1112,7 +1112,7 @@
                 Assert.IsTrue(plLine2.Exists());
                 Assert.IsTrue(plLine4.Exists());
                 Assert.AreEqual(plLine4.Points.Count, plLine2.Points.Count);
-                Assert.AreEqual(plLine4.Points[0].Z, 4.0);
+                Assert.AreEqual(4.0, plLine4.Points[0].Z);
                 for (var pointIndex = 0; pointIndex < plLine4.Points.Count; pointIndex++)
                 {
                     Assert.IsTrue(plLine2.Points[pointIndex].LocationEquals(plLine4.Points[pointIndex]));
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/PlLinesCreator.cs
===================================================================
diff -u -r4000 -r4023
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/PlLinesCreator.cs	(.../PlLinesCreator.cs)	(revision 4000)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/PlLinesCreator.cs	(.../PlLinesCreator.cs)	(revision 4023)
@@ -337,7 +337,7 @@
                         break;
                     case SoilProfileType.ProfileType2D:
                     case SoilProfileType.ProfileTypeStiFile:
-                        plLine = CreatePlLine2ByExpertKnowledgeFor2DGeometry(penetrationLength, headInPlLine2);
+                        plLine = CreatePlLine2ByExpertKnowledgeFor2DGeometry(headInPlLine2);
                         break;
                 }
             }
@@ -348,11 +348,10 @@
         /// <summary>
         /// Create PL2 (is pl line for penetration) for 2d-geometry
         /// </summary>
-        /// <param name="penetrationLength">Length of the penetration.</param>
         /// <param name="headInPlLine2">The head in pl line2.</param>
         /// <returns></returns>
         /// <exception cref="PlLinesCreatorException">Head PL2 not defined</exception>
-        private PlLine CreatePlLine2ByExpertKnowledgeFor2DGeometry(double penetrationLength, double? headInPlLine2)
+        private PlLine CreatePlLine2ByExpertKnowledgeFor2DGeometry(double? headInPlLine2)
         {
             if (headInPlLine2 == null)
             {
@@ -809,7 +808,7 @@
                     continue;
                 }
 
-                ConfigureUpliftCalculator(plLineType, upliftCalculator, surfacePoint);
+                ConfigureUpliftCalculator(upliftCalculator, surfacePoint);
                 SoilLayer1D relevantSandLayer = GetRelevantAquiferLayer(plLineType, upliftCalculator.SoilProfile);
                 // When PlLineType is PL4 it is possible that no relevant aquifer layer is found, then the adjustment is not necessary
                 if (relevantSandLayer != null)
@@ -865,7 +864,7 @@
 
                 foreach (GeometryPoint surfacePoint in recheckSurfacePointsList)
                 {
-                    ConfigureUpliftCalculator(plLineType, upliftCalculator, surfacePoint);
+                    ConfigureUpliftCalculator(upliftCalculator, surfacePoint);
                     SoilLayer1D relevantSandLayer = GetRelevantAquiferLayer(plLineType, upliftCalculator.SoilProfile);
                     // When PlLineType is PL4 it is possible that no relevant aquifer layer is found, then the adjustment is not necessary
                     if (relevantSandLayer != null)
@@ -895,10 +894,9 @@
         /// <summary>
         /// Configures the uplift calculator.
         /// </summary>
-        /// <param name="plLineType">Type of the pl line.</param>
         /// <param name="upliftCalculator">The uplift calculator.</param>
         /// <param name="surfacePoint">The surface point.</param>
-        private void ConfigureUpliftCalculator(PlLineType plLineType, UpliftCalculator upliftCalculator, GeometryPoint surfacePoint)
+        private void ConfigureUpliftCalculator(UpliftCalculator upliftCalculator, GeometryPoint surfacePoint)
         {
             // Offset to solve issue MWDAM-764
             const double offset = 0.01;
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/General/Parallel.cs
===================================================================
diff -u -r4000 -r4023
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/General/Parallel.cs	(.../Parallel.cs)	(revision 4000)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/General/Parallel.cs	(.../Parallel.cs)	(revision 4023)
@@ -26,7 +26,6 @@
 using System.Threading;
 using Deltares.DamEngine.Data.Standard.Calculation;
 using ThreadState = System.Threading.ThreadState;
-//using Deltares.Standard.Logging;
 
 namespace Deltares.DamEngine.Calculators.General
 {
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs
===================================================================
diff -u -r4008 -r4023
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs	(.../FillMacroStabilityWrapperInputFromEngine.cs)	(revision 4008)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs	(.../FillMacroStabilityWrapperInputFromEngine.cs)	(revision 4023)
@@ -124,7 +124,7 @@
                                                      preprocessingSearchAreaConditions.AutoTangentLines);
                     break;
                 default:
-                    throw new ArgumentOutOfRangeException(nameof(mStabParameters.Model));
+                    throw new NotImplementedException(nameof(mStabParameters.Model));
             }
 
             lastStage.UniformLoads = new List<UniformLoad>();