Index: dam failuremechanisms/damPiping/trunk/src/Deltares.DamPiping.SellmeijerVNKCalculator/PipingModel2Data.cs
===================================================================
diff -u -r375 -r397
--- dam failuremechanisms/damPiping/trunk/src/Deltares.DamPiping.SellmeijerVNKCalculator/PipingModel2Data.cs	(.../PipingModel2Data.cs)	(revision 375)
+++ dam failuremechanisms/damPiping/trunk/src/Deltares.DamPiping.SellmeijerVNKCalculator/PipingModel2Data.cs	(.../PipingModel2Data.cs)	(revision 397)
@@ -21,8 +21,6 @@
 
         private PipingCommonData fPipingCommonData = null;
 
-        private static List<string> fRowHeaderTextList = new List<string>();
-
         private double fHeadDrop = 0.0;
 
         private string fMessages;
@@ -39,33 +37,6 @@
             InitializeDefaults();
         }
 
-        static PipingModelModel2Data()
-        {
-            fRowHeaderTextList.Clear();
-
-            fRowHeaderTextList.Add("gamma_w");
-            fRowHeaderTextList.Add("mu");
-            fRowHeaderTextList.Add("gamma_p");
-            fRowHeaderTextList.Add("eta");
-            fRowHeaderTextList.Add("theta");
-            fRowHeaderTextList.Add("Adapt");
-            fRowHeaderTextList.Add("F");
-            fRowHeaderTextList.Add("i");
-            fRowHeaderTextList.Add("D1");
-            fRowHeaderTextList.Add("D2");
-            fRowHeaderTextList.Add("K1");
-            fRowHeaderTextList.Add("K2");
-            fRowHeaderTextList.Add("K3");
-            fRowHeaderTextList.Add("Do");
-            fRowHeaderTextList.Add("d70");
-            // special case: the "Calculation" column header can change with user's language preference
-            //FRowHeaderTextList.Add(LanguageSupport.GetText("CalculationType", System.Threading.Thread.CurrentThread.CurrentCulture));
-            //FRowHeaderTextList.Add("Calculate");
-            fRowHeaderTextList.Add("L");
-            fRowHeaderTextList.Add("dH");
-            fRowHeaderTextList.Add("Calculate"); // moved to end
-        }
-
         /// <summary>
         /// Initializes a new instance of the <see cref="PipingModelModel2Data"/> class.
         /// </summary>
@@ -244,13 +215,5 @@
         /// </value>
         public string WarningMessage { get { return fWarningMessage; } set { fWarningMessage = value; } }
 
-        /// <summary>
-        /// Gets the row header text list.
-        /// </summary>
-        /// <value>
-        /// The row header text list.
-        /// </value>
-        public static List<string> RowHeaderTextList { get { return fRowHeaderTextList; } }
-
     }
 }
Index: dam failuremechanisms/damPiping/trunk/src/Deltares.DamPiping.SellmeijerVNKCalculator/PipingCalculatorSellmeijerVNK.cs
===================================================================
diff -u -r385 -r397
--- dam failuremechanisms/damPiping/trunk/src/Deltares.DamPiping.SellmeijerVNKCalculator/PipingCalculatorSellmeijerVNK.cs	(.../PipingCalculatorSellmeijerVNK.cs)	(revision 385)
+++ dam failuremechanisms/damPiping/trunk/src/Deltares.DamPiping.SellmeijerVNKCalculator/PipingCalculatorSellmeijerVNK.cs	(.../PipingCalculatorSellmeijerVNK.cs)	(revision 397)
@@ -13,9 +13,6 @@
 
         public const double RcDefault = 0.3;
 
-        private double rc = RcDefault;
-        private double reducedFall;
-
         /// <summary>
         /// River level as input
         /// </summary>
@@ -39,11 +36,7 @@
         /// <summary>
         /// Reduction factor as input
         /// </summary>
-        public double Rc
-        {
-            get { return rc; }
-            set { rc = value; }
-        }
+        public double Rc { get; set; } = RcDefault;
 
         /// <summary>
         /// Total thickness of cover layer as input
@@ -111,7 +104,7 @@
         public void Calculate()
         {
             Hc = CalculateHCritical();
-            reducedFall = GetReducedFall();
+            var reducedFall = GetReducedFall();
             FoSp = DetermineFactorOfSafety(Hc, reducedFall);
         }
 
Index: dam failuremechanisms/damPiping/trunk/src/Deltares.DamPiping.SellmeijerVNKCalculator/PipingModel2Calculation.cs
===================================================================
diff -u -r376 -r397
--- dam failuremechanisms/damPiping/trunk/src/Deltares.DamPiping.SellmeijerVNKCalculator/PipingModel2Calculation.cs	(.../PipingModel2Calculation.cs)	(revision 376)
+++ dam failuremechanisms/damPiping/trunk/src/Deltares.DamPiping.SellmeijerVNKCalculator/PipingModel2Calculation.cs	(.../PipingModel2Calculation.cs)	(revision 397)
@@ -51,10 +51,6 @@
     {
         private PipingModelModel2Data fCurrentCalculationData = null;
 
-        private string fHomeDir = "";
-
-        private string fSessionId = "";
-
         /// <summary>
         /// Initializes a new instance of the <see cref="PipingModel2Calculation"/> class.
         /// </summary>
@@ -215,30 +211,6 @@
         }
 
         /// <summary>
-        /// Gets or sets the home dir.
-        /// </summary>
-        /// <value>
-        /// The home dir.
-        /// </value>
-        public string HomeDir
-        {
-            get { return fHomeDir; }
-            set { fHomeDir = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the session identifier.
-        /// </summary>
-        /// <value>
-        /// The session identifier.
-        /// </value>
-        public string SessionId
-        {
-            get { return fSessionId; }
-            set { fSessionId = value; }
-        }
-
-        /// <summary>
         /// Calculates the head drop pc2.
         /// </summary>
         /// <exception cref="PipingCalculationException">Error in Piping DLL</exception>