Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculatorFirstSlopeAdaptionThenShoulderAdaption.cs
===================================================================
diff -u -r1403 -r1582
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculatorFirstSlopeAdaptionThenShoulderAdaption.cs	(.../DesignCalculatorFirstSlopeAdaptionThenShoulderAdaption.cs)	(revision 1403)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculatorFirstSlopeAdaptionThenShoulderAdaption.cs	(.../DesignCalculatorFirstSlopeAdaptionThenShoulderAdaption.cs)	(revision 1582)
@@ -42,6 +42,19 @@
     public class DesignCalculatorFirstSlopeAdaptionThenShoulderAdaption
     {
         private const double defaultMaxFractionOfDikeHeightForShoulderHeight = 0.67;
+        /// <summary>
+        /// Performs the design calculation with strategy: first slope adaption then shoulder adaption.
+        /// </summary>
+        /// <param name="kernelWrapper">The kernel wrapper.</param>
+        /// <param name="kernelDataInput">The kernel data input.</param>
+        /// <param name="kernelDataOutput">The kernel data output.</param>
+        /// <param name="damKernelInput">The dam kernel input.</param>
+        /// <param name="designScenario">The design scenario.</param>
+        /// <param name="calculationMessages">The calculation messages.</param>
+        /// <param name="designCalculations">The design calculations.</param>
+        /// <exception cref="SurfaceLineException">
+        /// </exception>
+        /// <exception cref="DesignCalculatorException"></exception>
         public static void PerformDesignCalculationFirstSlopeAdaptionThenShoulderAdaption(IKernelWrapper kernelWrapper,
             IKernelDataInput kernelDataInput, IKernelDataOutput kernelDataOutput, DamKernelInput damKernelInput,
             DesignScenario designScenario, List<LogMessage> calculationMessages, List<DesignResult> designCalculations)
@@ -54,8 +67,9 @@
             int iterationIndex = -1;
 
             designScenario.CalculationResult = CalculationResult.NoRun;
-            // Create the file with the initial geometry to be used to determine which layers have to be defined as dike embankment material 
             EmbankmentDesignParameters embankmentDesignParameters;
+
+            // Prepare the kernel for design
             kernelWrapper.PrepareDesign(kernelDataInput, kernelDataOutput, damKernelInput, iterationIndex, out embankmentDesignParameters);
             SurfaceLine2 surfaceLine = designScenario.GetMostRecentSurfaceLine(subSoilScenario.SoilProfile1D, subSoilScenario.StiFileName).FullDeepClone();
 
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs
===================================================================
diff -u -r1472 -r1582
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs	(.../DesignCalculator.cs)	(revision 1472)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs	(.../DesignCalculator.cs)	(revision 1582)
@@ -184,7 +184,7 @@
         }
 
         /// <summary>
-        /// Performs the design calculation shoulder per point.
+        /// Performs the design calculation
         /// </summary>
         /// <param name="kernelWrapper">The kernel wrapper.</param>
         /// <param name="kernelDataInput">The kernel data input.</param>
@@ -344,17 +344,5 @@
             return CalculationResult.Succeeded;
         }
 
-        private int DetermineMainNumberOfCalculations(IList<Location> locations)
-        {
-            var total = 0;
-            foreach (var location in locations)
-            {
-                for (int subSoilScenarioIndex = 0; subSoilScenarioIndex < location.Segment.SoilProfileProbabilities.Count; subSoilScenarioIndex++)
-                {
-                    total++;
-                }
-            }
-            return total;
-        }
     }
 }
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/SurfaceLineHeightAdapter.cs
===================================================================
diff -u -r971 -r1582
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/SurfaceLineHeightAdapter.cs	(.../SurfaceLineHeightAdapter.cs)	(revision 971)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/SurfaceLineHeightAdapter.cs	(.../SurfaceLineHeightAdapter.cs)	(revision 1582)
@@ -27,14 +27,6 @@
 namespace Deltares.DamEngine.Calculators.DikesDesign
 {
     /// <summary>
-    /// Exception class for SurfaceLineHeightAdapter
-    /// </summary>
-    public class SurfaceLineHeightAdapterException : Exception
-    {
-        public SurfaceLineHeightAdapterException(string message) : base(message) { }
-    }
-
-    /// <summary>
     /// Class for adapting the height of the crest of a surfaceline
     /// </summary>
     public class SurfaceLineHeightAdapter : SurfaceLineAdapter