diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard/EntryForm.cs b/TestBenchFramework/BenchControl/DataEntry/Standard/EntryForm.cs
index f25e988f6..a6609b129 100644
--- a/TestBenchFramework/BenchControl/DataEntry/Standard/EntryForm.cs
+++ b/TestBenchFramework/BenchControl/DataEntry/Standard/EntryForm.cs
@@ -192,17 +192,6 @@ namespace TBF.BenchControl.DataEntry.Standard
 						}
 					}
 				}
-				else if (modelessDlg is TestStartForm)
-				{
-                    /// Fixed start test - start (obsolete)
-					TestStartForm dlg = (modelessDlg as TestStartForm);
-
-					for (int i = 0; i < dlg.WaterMetersCount; i++)
-					{
-						wmStartState[i] = dlg.WMStartState[i];
-						wmStartStateStr[i] = dlg.WMStartStateStr[i];
-					}
-				}
                 else if (modelessDlg is TestStartEndForm && currentOp == CurrentOp.EnterTestStartStates)
 				{
                     /// Fixed start test - start
diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard/EntryFormCfg.cs b/TestBenchFramework/BenchControl/DataEntry/Standard/EntryFormCfg.cs
index 505f3f417..5489f416f 100644
--- a/TestBenchFramework/BenchControl/DataEntry/Standard/EntryFormCfg.cs
+++ b/TestBenchFramework/BenchControl/DataEntry/Standard/EntryFormCfg.cs
@@ -17,7 +17,6 @@ namespace TBF.BenchControl.DataEntry.Standard
 		///
 		/// Serialized parameters
 		///
-		public Entities.UnitsVolume Units;
 
 		/// Private parameterless constructor invoked by all other (public) constructors
 		EntryFormCfg()
@@ -30,14 +29,11 @@ namespace TBF.BenchControl.DataEntry.Standard
             : this()
         {
             this.Factory = factory;
-			this.Units = Entities.UnitsVolume.CubicMtr;
         }
 
         public string ToString(int i)
         {
-            return string.Format("Name={0}, Units={1}",
-								 Name,
-								 (Units == Entities.UnitsVolume.CubicMtr) ? "m3" : "l");
+            return string.Format("Name={0}", Name);
         }
     }
 }
diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard/EntryFormCfgCtrl.cs b/TestBenchFramework/BenchControl/DataEntry/Standard/EntryFormCfgCtrl.cs
index 3c42de1ab..bd9891355 100644
--- a/TestBenchFramework/BenchControl/DataEntry/Standard/EntryFormCfgCtrl.cs
+++ b/TestBenchFramework/BenchControl/DataEntry/Standard/EntryFormCfgCtrl.cs
@@ -32,8 +32,6 @@ namespace TBF.BenchControl.DataEntry.Standard
 
 		private void EntryFormCfgCtrl_Load(object sender, EventArgs e)
 		{
-			unitsComboBox.Items.Add("m3");
-			unitsComboBox.Items.Add("liter");
 			Redraw();
 		}
 
@@ -46,23 +44,16 @@ namespace TBF.BenchControl.DataEntry.Standard
 			if (config == null) return;			/// Control was not loaded, settings were not changed
 			classNameLabel.Text = config.Factory.ClassName;
 			nameTextBox.Text = config.Name;
-			unitsComboBox.Text = (config.Units == Entities.UnitsVolume.CubicMtr) ? "m3" : "liter";
 		}
 
 		public void Unlock()
 		{
 			nameTextBox.Enabled = true;
-			unitsComboBox.Enabled = true;
 		}
 
 		public CfgUpdateFlags VerifyCfg(ref string message)
 		{
             CfgUpdateFlags flags = CfgUpdateFlags.None;
-			if (unitsComboBox.Text != "m3" && unitsComboBox.Text != "liter")
-			{
-				message = "Units for volume should be liter or m3";
-				flags = CfgUpdateFlags.Error;
-			}
 			return flags;
 		}
 
@@ -74,11 +65,6 @@ namespace TBF.BenchControl.DataEntry.Standard
 
 			config.Name = nameTextBox.Text;
 
-			if (unitsComboBox.Text == "m3")
-				config.Units = Entities.UnitsVolume.CubicMtr;
-			else
-				config.Units = Entities.UnitsVolume.Liter;
-
 			return flags;
 		}
 	}
diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard/EntryFormCfgCtrl.designer.cs b/TestBenchFramework/BenchControl/DataEntry/Standard/EntryFormCfgCtrl.designer.cs
index e2696dacd..b4337a56c 100644
--- a/TestBenchFramework/BenchControl/DataEntry/Standard/EntryFormCfgCtrl.designer.cs
+++ b/TestBenchFramework/BenchControl/DataEntry/Standard/EntryFormCfgCtrl.designer.cs
@@ -34,8 +34,6 @@ namespace TBF.BenchControl.DataEntry.Standard
 			this.nameTextBox = new System.Windows.Forms.TextBox();
 			this.nameLabel = new System.Windows.Forms.Label();
 			this.classNameLabel = new System.Windows.Forms.Label();
-			this.unitsComboBox = new System.Windows.Forms.ComboBox();
-			this.unitsLabel = new System.Windows.Forms.Label();
 			this.SuspendLayout();
 			// 
 			// nameTextBox
@@ -64,30 +62,10 @@ namespace TBF.BenchControl.DataEntry.Standard
 			this.classNameLabel.TabIndex = 3;
 			this.classNameLabel.Text = "ComonentName";
 			// 
-			// unitsComboBox
-			// 
-			this.unitsComboBox.Enabled = false;
-			this.unitsComboBox.FormattingEnabled = true;
-			this.unitsComboBox.Location = new System.Drawing.Point(137, 84);
-			this.unitsComboBox.Name = "unitsComboBox";
-			this.unitsComboBox.Size = new System.Drawing.Size(80, 21);
-			this.unitsComboBox.TabIndex = 6;
-			// 
-			// unitsLabel
-			// 
-			this.unitsLabel.AutoSize = true;
-			this.unitsLabel.Location = new System.Drawing.Point(27, 87);
-			this.unitsLabel.Name = "unitsLabel";
-			this.unitsLabel.Size = new System.Drawing.Size(83, 13);
-			this.unitsLabel.TabIndex = 7;
-			this.unitsLabel.Text = "Units for volume";
-			// 
 			// EntryFormCfgCtrl
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.Controls.Add(this.unitsLabel);
-			this.Controls.Add(this.unitsComboBox);
 			this.Controls.Add(this.nameTextBox);
 			this.Controls.Add(this.nameLabel);
 			this.Controls.Add(this.classNameLabel);
@@ -104,7 +82,5 @@ namespace TBF.BenchControl.DataEntry.Standard
 		private System.Windows.Forms.TextBox nameTextBox;
 		private System.Windows.Forms.Label nameLabel;
 		private System.Windows.Forms.Label classNameLabel;
-		private System.Windows.Forms.ComboBox unitsComboBox;
-		private System.Windows.Forms.Label unitsLabel;
 	}
 }
diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard/TestStartForm.cs b/TestBenchFramework/BenchControl/DataEntry/Standard/TestStartForm.cs
deleted file mode 100644
index 4cdb14fd8..000000000
--- a/TestBenchFramework/BenchControl/DataEntry/Standard/TestStartForm.cs
+++ /dev/null
@@ -1,146 +0,0 @@
-///
-/// Copyright (c) 2013-2015 Sensus Metering Systems
-///
-using System;
-using System.Windows.Forms;
-using log4net;
-using TBF.Resources;
-
-namespace TBF.BenchControl.DataEntry.Standard
-{
-	public partial class TestStartForm : Form, GenericDevices.IHasCompleted
-    {
-		private static readonly ILog log = LogManager.GetLogger(typeof(TestStartForm));
-
-		/// <summary> Number of text boxes for serial numbers </summary>
-        public readonly int WaterMetersCount;
-		public readonly Entities.UnitsVolume Units;
-
-		// To be retrieved after the form closes
-        public float[] WMStartState;
-		public string[] WMStartStateStr;
-
-		// Set to 'true' when the form closes
-        public bool Completed { get { return completed; } }
-		bool completed;
-
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="waterMetersCount">Number of text boxes for serial numbers</param>
-		public TestStartForm(int waterMetersCount, Entities.UnitsVolume units)
-        {
-            this.WaterMetersCount = waterMetersCount;
-			this.Units = units;
-            InitializeComponent();
-            WMStartState = new float[WaterMetersCount];
-			WMStartStateStr = new string[WaterMetersCount];
-            completed = false;
-			StartForceCloseHandler();
-		}
-
-        /// <summary> Parameterless constructor for all watermeters </summary>
-        public TestStartForm()
-            : this(Program.WMsCount, Entities.UnitsVolume.CubicMtr)
-        {
-		}
-
-		private void CycleEndForm_Load(object sender, EventArgs e)
-		{
-            Localize();
-
-            Height = 95 + 90 * WaterMetersCount;
-
-            if (WaterMetersCount < 1) groupBox1.Visible = false;
-            if (WaterMetersCount < 2) groupBox2.Visible = false;
-            if (WaterMetersCount < 3) groupBox3.Visible = false;
-            if (WaterMetersCount < 4) groupBox4.Visible = false;
-            if (WaterMetersCount < 5) groupBox5.Visible = false;
-            if (WaterMetersCount < 6) groupBox6.Visible = false;
-		}
-
-		void Localize()
-		{
-			Text = Strings.Water_Meter_States;
-			groupBox1.Text = Strings.Water_Meter + " 1";
-			groupBox2.Text = Strings.Water_Meter + " 2";
-			groupBox3.Text = Strings.Water_Meter + " 3";
-			groupBox4.Text = Strings.Water_Meter + " 4";
-			groupBox5.Text = Strings.Water_Meter + " 5";
-			groupBox6.Text = Strings.Water_Meter + " 6";
-			wmStateLabel1.Text = Strings.WMState;
-			wmStateLabel2.Text = Strings.WMState;
-			wmStateLabel3.Text = Strings.WMState;
-			wmStateLabel4.Text = Strings.WMState;
-			wmStateLabel5.Text = Strings.WMState;
-			wmStateLabel6.Text = Strings.WMState;
-			okButton.Text = Strings.OkBtnText;
-		}
-
-		private void okButton_Click(object sender, EventArgs e)
-		{
-            try
-            {
-				/// Factor to convert the entered volume to liters
-				float factor = (Units == Entities.UnitsVolume.CubicMtr) ? 1000.0f : 1.0f;
-
-				if (WaterMetersCount >= 1)
-				{
-					WMStartStateStr[0] = wmStateTextBox1.Text;
-					WMStartState[0] = factor * Utils.ParseUFloat(wmStateTextBox1.Text);
-				}
-				if (WaterMetersCount >= 2)
-				{
-					WMStartStateStr[1] = wmStateTextBox2.Text;
-					WMStartState[1] = factor * Utils.ParseUFloat(wmStateTextBox2.Text);
-				}
-				if (WaterMetersCount >= 3)
-				{
-					WMStartStateStr[2] = wmStateTextBox3.Text;
-					WMStartState[2] = factor * Utils.ParseUFloat(wmStateTextBox3.Text);
-				}
-				if (WaterMetersCount >= 4)
-				{
-					WMStartStateStr[3] = wmStateTextBox4.Text;
-					WMStartState[3] = factor * Utils.ParseUFloat(wmStateTextBox4.Text);
-				}
-				if (WaterMetersCount >= 5)
-				{
-					WMStartStateStr[4] = wmStateTextBox5.Text;
-					WMStartState[4] = factor * Utils.ParseUFloat(wmStateTextBox5.Text);
-				}
-				if (WaterMetersCount >= 6)
-				{
-					WMStartStateStr[5] = wmStateTextBox6.Text;
-					WMStartState[5] = factor * Utils.ParseUFloat(wmStateTextBox6.Text);
-				}
-            }
-            catch
-            {
-                return;
-            }
-
-			completed = true;
-			Close();
-		}
-
-		#region Forced close handling
-
-		public void StartForceCloseHandler()
-		{
-			UiBridge.Bridge.CloseModelessFormHandler += delegate(object sender, EventArgs args)
-			{
-				if (InvokeRequired) { Invoke(new EventHandler<EventArgs>(OnForceClose), sender, args); }
-				else OnForceClose(sender, args);
-			};
-		}
-
-		void OnForceClose(object sender, EventArgs args)
-		{
-			DialogResult = DialogResult.Cancel;
-			Close();
-		}
-
-		#endregion
-	}
-}
diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard/TestStartForm.designer.cs b/TestBenchFramework/BenchControl/DataEntry/Standard/TestStartForm.designer.cs
deleted file mode 100644
index 629554c4c..000000000
--- a/TestBenchFramework/BenchControl/DataEntry/Standard/TestStartForm.designer.cs
+++ /dev/null
@@ -1,305 +0,0 @@
-///
-/// Copyright (c) 2013-2015 Sensus Metering Systems
-///
-namespace TBF.BenchControl.DataEntry.Standard
-{
-    partial class TestStartForm
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-			this.groupBox2 = new System.Windows.Forms.GroupBox();
-			this.wmStateTextBox2 = new System.Windows.Forms.TextBox();
-			this.wmStateLabel2 = new System.Windows.Forms.Label();
-			this.groupBox1 = new System.Windows.Forms.GroupBox();
-			this.wmStateTextBox1 = new System.Windows.Forms.TextBox();
-			this.wmStateLabel1 = new System.Windows.Forms.Label();
-			this.okButton = new System.Windows.Forms.Button();
-			this.groupBox3 = new System.Windows.Forms.GroupBox();
-			this.wmStateTextBox3 = new System.Windows.Forms.TextBox();
-			this.wmStateLabel3 = new System.Windows.Forms.Label();
-			this.groupBox4 = new System.Windows.Forms.GroupBox();
-			this.wmStateTextBox4 = new System.Windows.Forms.TextBox();
-			this.wmStateLabel4 = new System.Windows.Forms.Label();
-			this.groupBox5 = new System.Windows.Forms.GroupBox();
-			this.wmStateTextBox5 = new System.Windows.Forms.TextBox();
-			this.wmStateLabel5 = new System.Windows.Forms.Label();
-			this.groupBox6 = new System.Windows.Forms.GroupBox();
-			this.wmStateTextBox6 = new System.Windows.Forms.TextBox();
-			this.wmStateLabel6 = new System.Windows.Forms.Label();
-			this.groupBox2.SuspendLayout();
-			this.groupBox1.SuspendLayout();
-			this.groupBox3.SuspendLayout();
-			this.groupBox4.SuspendLayout();
-			this.groupBox5.SuspendLayout();
-			this.groupBox6.SuspendLayout();
-			this.SuspendLayout();
-			// 
-			// groupBox2
-			// 
-			this.groupBox2.Controls.Add(this.wmStateTextBox2);
-			this.groupBox2.Controls.Add(this.wmStateLabel2);
-			this.groupBox2.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-			this.groupBox2.ForeColor = System.Drawing.Color.Black;
-			this.groupBox2.Location = new System.Drawing.Point(25, 102);
-			this.groupBox2.Name = "groupBox2";
-			this.groupBox2.Size = new System.Drawing.Size(362, 81);
-			this.groupBox2.TabIndex = 2;
-			this.groupBox2.TabStop = false;
-			this.groupBox2.Text = "Water Meter 2";
-			// 
-			// wmStateTextBox2
-			// 
-			this.wmStateTextBox2.Location = new System.Drawing.Point(183, 31);
-			this.wmStateTextBox2.Name = "wmStateTextBox2";
-			this.wmStateTextBox2.Size = new System.Drawing.Size(163, 31);
-			this.wmStateTextBox2.TabIndex = 1;
-			// 
-			// wmStateLabel2
-			// 
-			this.wmStateLabel2.AutoSize = true;
-			this.wmStateLabel2.Location = new System.Drawing.Point(18, 34);
-			this.wmStateLabel2.Name = "wmStateLabel2";
-			this.wmStateLabel2.Size = new System.Drawing.Size(68, 23);
-			this.wmStateLabel2.TabIndex = 0;
-			this.wmStateLabel2.Text = "State:";
-			// 
-			// groupBox1
-			// 
-			this.groupBox1.Controls.Add(this.wmStateTextBox1);
-			this.groupBox1.Controls.Add(this.wmStateLabel1);
-			this.groupBox1.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-			this.groupBox1.ForeColor = System.Drawing.Color.Black;
-			this.groupBox1.Location = new System.Drawing.Point(25, 12);
-			this.groupBox1.Name = "groupBox1";
-			this.groupBox1.Size = new System.Drawing.Size(362, 81);
-			this.groupBox1.TabIndex = 1;
-			this.groupBox1.TabStop = false;
-			this.groupBox1.Text = "Water Meter 1";
-			// 
-			// wmStateTextBox1
-			// 
-			this.wmStateTextBox1.Location = new System.Drawing.Point(183, 31);
-			this.wmStateTextBox1.Name = "wmStateTextBox1";
-			this.wmStateTextBox1.Size = new System.Drawing.Size(163, 31);
-			this.wmStateTextBox1.TabIndex = 1;
-			// 
-			// wmStateLabel1
-			// 
-			this.wmStateLabel1.AutoSize = true;
-			this.wmStateLabel1.Location = new System.Drawing.Point(18, 34);
-			this.wmStateLabel1.Name = "wmStateLabel1";
-			this.wmStateLabel1.Size = new System.Drawing.Size(68, 23);
-			this.wmStateLabel1.TabIndex = 0;
-			this.wmStateLabel1.Text = "State:";
-			// 
-			// okButton
-			// 
-			this.okButton.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-			this.okButton.ForeColor = System.Drawing.Color.Black;
-			this.okButton.Location = new System.Drawing.Point(425, 21);
-			this.okButton.Name = "okButton";
-			this.okButton.Size = new System.Drawing.Size(98, 63);
-			this.okButton.TabIndex = 7;
-			this.okButton.Text = "OK";
-			this.okButton.UseVisualStyleBackColor = true;
-			this.okButton.Click += new System.EventHandler(this.okButton_Click);
-			// 
-			// groupBox3
-			// 
-			this.groupBox3.Controls.Add(this.wmStateTextBox3);
-			this.groupBox3.Controls.Add(this.wmStateLabel3);
-			this.groupBox3.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-			this.groupBox3.ForeColor = System.Drawing.Color.Black;
-			this.groupBox3.Location = new System.Drawing.Point(25, 192);
-			this.groupBox3.Name = "groupBox3";
-			this.groupBox3.Size = new System.Drawing.Size(362, 81);
-			this.groupBox3.TabIndex = 3;
-			this.groupBox3.TabStop = false;
-			this.groupBox3.Text = "Water Meter 3";
-			// 
-			// wmStateTextBox3
-			// 
-			this.wmStateTextBox3.Location = new System.Drawing.Point(183, 31);
-			this.wmStateTextBox3.Name = "wmStateTextBox3";
-			this.wmStateTextBox3.Size = new System.Drawing.Size(163, 31);
-			this.wmStateTextBox3.TabIndex = 1;
-			// 
-			// wmStateLabel3
-			// 
-			this.wmStateLabel3.AutoSize = true;
-			this.wmStateLabel3.Location = new System.Drawing.Point(18, 34);
-			this.wmStateLabel3.Name = "wmStateLabel3";
-			this.wmStateLabel3.Size = new System.Drawing.Size(68, 23);
-			this.wmStateLabel3.TabIndex = 0;
-			this.wmStateLabel3.Text = "State:";
-			// 
-			// groupBox4
-			// 
-			this.groupBox4.Controls.Add(this.wmStateTextBox4);
-			this.groupBox4.Controls.Add(this.wmStateLabel4);
-			this.groupBox4.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-			this.groupBox4.ForeColor = System.Drawing.Color.Black;
-			this.groupBox4.Location = new System.Drawing.Point(25, 282);
-			this.groupBox4.Name = "groupBox4";
-			this.groupBox4.Size = new System.Drawing.Size(362, 81);
-			this.groupBox4.TabIndex = 4;
-			this.groupBox4.TabStop = false;
-			this.groupBox4.Text = "Water Meter 4";
-			// 
-			// wmStateTextBox4
-			// 
-			this.wmStateTextBox4.Location = new System.Drawing.Point(183, 31);
-			this.wmStateTextBox4.Name = "wmStateTextBox4";
-			this.wmStateTextBox4.Size = new System.Drawing.Size(163, 31);
-			this.wmStateTextBox4.TabIndex = 1;
-			// 
-			// wmStateLabel4
-			// 
-			this.wmStateLabel4.AutoSize = true;
-			this.wmStateLabel4.Location = new System.Drawing.Point(18, 34);
-			this.wmStateLabel4.Name = "wmStateLabel4";
-			this.wmStateLabel4.Size = new System.Drawing.Size(68, 23);
-			this.wmStateLabel4.TabIndex = 0;
-			this.wmStateLabel4.Text = "State:";
-			// 
-			// groupBox5
-			// 
-			this.groupBox5.Controls.Add(this.wmStateTextBox5);
-			this.groupBox5.Controls.Add(this.wmStateLabel5);
-			this.groupBox5.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-			this.groupBox5.ForeColor = System.Drawing.Color.Black;
-			this.groupBox5.Location = new System.Drawing.Point(25, 372);
-			this.groupBox5.Name = "groupBox5";
-			this.groupBox5.Size = new System.Drawing.Size(362, 81);
-			this.groupBox5.TabIndex = 5;
-			this.groupBox5.TabStop = false;
-			this.groupBox5.Text = "Water Meter 5";
-			// 
-			// wmStateTextBox5
-			// 
-			this.wmStateTextBox5.Location = new System.Drawing.Point(183, 31);
-			this.wmStateTextBox5.Name = "wmStateTextBox5";
-			this.wmStateTextBox5.Size = new System.Drawing.Size(163, 31);
-			this.wmStateTextBox5.TabIndex = 1;
-			// 
-			// wmStateLabel5
-			// 
-			this.wmStateLabel5.AutoSize = true;
-			this.wmStateLabel5.Location = new System.Drawing.Point(18, 34);
-			this.wmStateLabel5.Name = "wmStateLabel5";
-			this.wmStateLabel5.Size = new System.Drawing.Size(68, 23);
-			this.wmStateLabel5.TabIndex = 0;
-			this.wmStateLabel5.Text = "State:";
-			// 
-			// groupBox6
-			// 
-			this.groupBox6.Controls.Add(this.wmStateTextBox6);
-			this.groupBox6.Controls.Add(this.wmStateLabel6);
-			this.groupBox6.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-			this.groupBox6.ForeColor = System.Drawing.Color.Black;
-			this.groupBox6.Location = new System.Drawing.Point(25, 462);
-			this.groupBox6.Name = "groupBox6";
-			this.groupBox6.Size = new System.Drawing.Size(362, 81);
-			this.groupBox6.TabIndex = 6;
-			this.groupBox6.TabStop = false;
-			this.groupBox6.Text = "Water Meter 6";
-			// 
-			// wmStateTextBox6
-			// 
-			this.wmStateTextBox6.Location = new System.Drawing.Point(183, 31);
-			this.wmStateTextBox6.Name = "wmStateTextBox6";
-			this.wmStateTextBox6.Size = new System.Drawing.Size(163, 31);
-			this.wmStateTextBox6.TabIndex = 1;
-			// 
-			// wmStateLabel6
-			// 
-			this.wmStateLabel6.AutoSize = true;
-			this.wmStateLabel6.Location = new System.Drawing.Point(18, 34);
-			this.wmStateLabel6.Name = "wmStateLabel6";
-			this.wmStateLabel6.Size = new System.Drawing.Size(68, 23);
-			this.wmStateLabel6.TabIndex = 0;
-			this.wmStateLabel6.Text = "State:";
-			// 
-			// TestStartForm
-			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.BackColor = System.Drawing.Color.DarkGoldenrod;
-			this.ClientSize = new System.Drawing.Size(559, 565);
-			this.Controls.Add(this.groupBox6);
-			this.Controls.Add(this.groupBox5);
-			this.Controls.Add(this.groupBox4);
-			this.Controls.Add(this.groupBox3);
-			this.Controls.Add(this.okButton);
-			this.Controls.Add(this.groupBox2);
-			this.Controls.Add(this.groupBox1);
-			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
-			this.Name = "TestStartForm";
-			this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
-			this.Text = "Start States";
-			this.TopMost = true;
-			this.Load += new System.EventHandler(this.CycleEndForm_Load);
-			this.groupBox2.ResumeLayout(false);
-			this.groupBox2.PerformLayout();
-			this.groupBox1.ResumeLayout(false);
-			this.groupBox1.PerformLayout();
-			this.groupBox3.ResumeLayout(false);
-			this.groupBox3.PerformLayout();
-			this.groupBox4.ResumeLayout(false);
-			this.groupBox4.PerformLayout();
-			this.groupBox5.ResumeLayout(false);
-			this.groupBox5.PerformLayout();
-			this.groupBox6.ResumeLayout(false);
-			this.groupBox6.PerformLayout();
-			this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-		private System.Windows.Forms.GroupBox groupBox2;
-		private System.Windows.Forms.TextBox wmStateTextBox2;
-		private System.Windows.Forms.Label wmStateLabel2;
-		private System.Windows.Forms.GroupBox groupBox1;
-		private System.Windows.Forms.TextBox wmStateTextBox1;
-		private System.Windows.Forms.Label wmStateLabel1;
-        private System.Windows.Forms.Button okButton;
-        private System.Windows.Forms.GroupBox groupBox3;
-        private System.Windows.Forms.TextBox wmStateTextBox3;
-        private System.Windows.Forms.Label wmStateLabel3;
-        private System.Windows.Forms.GroupBox groupBox4;
-        private System.Windows.Forms.TextBox wmStateTextBox4;
-        private System.Windows.Forms.Label wmStateLabel4;
-        private System.Windows.Forms.GroupBox groupBox5;
-        private System.Windows.Forms.TextBox wmStateTextBox5;
-        private System.Windows.Forms.Label wmStateLabel5;
-        private System.Windows.Forms.GroupBox groupBox6;
-        private System.Windows.Forms.TextBox wmStateTextBox6;
-        private System.Windows.Forms.Label wmStateLabel6;
-
-	}
-}
\ No newline at end of file
diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard/TestStartForm.resx b/TestBenchFramework/BenchControl/DataEntry/Standard/TestStartForm.resx
deleted file mode 100644
index 1af7de150..000000000
--- a/TestBenchFramework/BenchControl/DataEntry/Standard/TestStartForm.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
\ No newline at end of file
diff --git a/TestBenchFramework/TBF.csproj b/TestBenchFramework/TBF.csproj
index 7f00041a7..2d17856f2 100644
--- a/TestBenchFramework/TBF.csproj
+++ b/TestBenchFramework/TBF.csproj
@@ -156,12 +156,6 @@
     <Compile Include="BenchControl\DataEntry\Standard\TestStartEndForm.designer.cs">
       <DependentUpon>TestStartEndForm.cs</DependentUpon>
     </Compile>
-    <Compile Include="BenchControl\DataEntry\Standard\TestStartForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="BenchControl\DataEntry\Standard\TestStartForm.designer.cs">
-      <DependentUpon>TestStartForm.cs</DependentUpon>
-    </Compile>
     <Compile Include="BenchControl\Elde\Diverter\Handlers.cs" />
     <Compile Include="PrintOrderDocument.cs">
       <SubType>Component</SubType>
@@ -1173,9 +1167,6 @@
     <EmbeddedResource Include="BenchControl\DataEntry\Standard\TestStartEndForm.resx">
       <DependentUpon>TestStartEndForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="BenchControl\DataEntry\Standard\TestStartForm.resx">
-      <DependentUpon>TestStartForm.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="BenchControl\DataEntry\WMStates\WMSNsAndStatesForm.resx">
       <DependentUpon>WMSNsAndStatesForm.cs</DependentUpon>
     </EmbeddedResource>