diff --git a/Results/BatchResults.cs b/Results/BatchResults.cs
index a2fce7ade..b582e307c 100644
--- a/Results/BatchResults.cs
+++ b/Results/BatchResults.cs
@@ -14,11 +14,6 @@ namespace Results
 		public IList<Entities.Components> ComponentsList;
 		public IList<Entities.WaterMeterData> WaterMeterDataList;
 
-		public IDictionary<string, TestRslt> TestRsltsMap;
-		public IDictionary<string, MeterTestRslt>[] MeterTestRsltsMap;
-		public IDictionary<string, MeterTestRslt>[] MainMeterTestRsltsMap;
-		public IDictionary<string, MeterTestRslt>[] AuxMeterTestRsltsMap;
-
 		private BatchResults(int wmPositionsCount)
 		{
 			WMPositionsCount = wmPositionsCount;
@@ -26,18 +21,6 @@ namespace Results
 			TestDataList = new List<Entities.TestData>();
 			ComponentsList = new List<Entities.Components>();
 			WaterMeterDataList = new List<Entities.WaterMeterData>();
-
-			TestRsltsMap = new Dictionary<string, TestRslt>();
-			MeterTestRsltsMap = new Dictionary<string, MeterTestRslt>[WMPositionsCount];
-			MainMeterTestRsltsMap = new Dictionary<string, MeterTestRslt>[WMPositionsCount];
-			AuxMeterTestRsltsMap = new Dictionary<string, MeterTestRslt>[WMPositionsCount];
-
-			for (int wmnr = 0; wmnr < WMPositionsCount; wmnr++)
-			{
-				MeterTestRsltsMap[wmnr] = new Dictionary<string, MeterTestRslt>();
-				MainMeterTestRsltsMap[wmnr] = new Dictionary<string, MeterTestRslt>();
-				AuxMeterTestRsltsMap[wmnr] = new Dictionary<string, MeterTestRslt>();
-			}
 		}
 
 
@@ -87,7 +70,6 @@ namespace Results
 						/// Create an empty test result and add it to the list
 						TestRslt tr = new TestRslt(d.Batch, td, t.Part, rnr);
 						d.Batch.TestRslts.Add(tr);
-						d.TestRsltsMap.Add(tr.Name(), tr);
 
 						for (int i = 0; i < d.WMPositionsCount; i++)
 						{
@@ -100,21 +82,17 @@ namespace Results
 							{
 								MeterTestRslt mtr = new MeterTestRslt(d.WaterMeters[i], tr, Config.Entities.CompoundMeterId.Single);
 								d.WaterMeters[i].MeterTestRslts.Add(mtr);
-								d.MeterTestRsltsMap[i].Add(tr.Name(), mtr);
 							}
 							else
 							{
 								MeterTestRslt mainMTR = new MeterTestRslt(d.WaterMeters[i], tr, Config.Entities.CompoundMeterId.CompoundMain);
 								d.WaterMeters[i].MeterTestRslts.Add(mainMTR);
-								d.MainMeterTestRsltsMap[i].Add(tr.Name(), mainMTR);
 
 								MeterTestRslt auxMTR = new MeterTestRslt(d.WaterMeters[i], tr, Config.Entities.CompoundMeterId.CompoundAux);
 								d.WaterMeters[i].MeterTestRslts.Add(auxMTR);
-								d.MainMeterTestRsltsMap[i].Add(tr.Name(), auxMTR);
 
 								MeterTestRslt cmpdMTR = new MeterTestRslt(d.WaterMeters[i], tr, Config.Entities.CompoundMeterId.Compound);
 								d.WaterMeters[i].MeterTestRslts.Add(cmpdMTR);
-								d.MainMeterTestRsltsMap[i].Add(tr.Name(), cmpdMTR);
 							}
 						}
 					}
diff --git a/Results/Properties/AssemblyInfo.cs b/Results/Properties/AssemblyInfo.cs
index 32a61b022..93da73f9c 100644
--- a/Results/Properties/AssemblyInfo.cs
+++ b/Results/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.1.182.0")]
-[assembly: AssemblyFileVersion("2.1.182.0")]
+[assembly: AssemblyVersion("2.1.185.0")]
+[assembly: AssemblyFileVersion("2.1.185.0")]
diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs
index 498dc502c..6cd7c7de1 100644
--- a/TestBenchFramework/Properties/AssemblyInfo.cs
+++ b/TestBenchFramework/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.1.184.1")]
-[assembly: AssemblyFileVersion("2.1.184.1")]
+[assembly: AssemblyVersion("2.1.185.1")]
+[assembly: AssemblyFileVersion("2.1.185.1")]