diff --git a/Common/Hardware/WaterMeter/Genesis/GenesisCore/PowerCorrection.cs b/Common/Hardware/WaterMeter/Genesis/GenesisCore/PowerCorrection.cs
index 03c6c797..e566c561 100644
--- a/Common/Hardware/WaterMeter/Genesis/GenesisCore/PowerCorrection.cs
+++ b/Common/Hardware/WaterMeter/Genesis/GenesisCore/PowerCorrection.cs
@@ -63,7 +63,7 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
         /// <summary>
         /// Threshold for power correction EMEA version
         /// </summary>
-        public const UInt32 EmeaFwThresholdForPowCorr= 0x1300;
+        public const UInt32 EmeaFwThresholdForPowCorr = 0x1300;
         /// <summary>
         /// Threshold for power correction NA version
         /// </summary>
diff --git a/ServiceFwUpdate/ServiceFwUpdate.sln b/ServiceFwUpdate/ServiceFwUpdate.sln
index 9cdf4c96..bf8c01f7 100644
--- a/ServiceFwUpdate/ServiceFwUpdate.sln
+++ b/ServiceFwUpdate/ServiceFwUpdate.sln
@@ -198,10 +198,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GenesisStatus", "GenesisSta
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GenesisStatus", "..\Common\Hardware\WaterMeter\Genesis\GenesisStatus\GenesisStatus.csproj", "{0F646872-D8DC-4EE5-989F-D4C73F0ACE3F}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Service", "Service", "{7C0CC530-F1C6-4906-873C-D94041F4D4A2}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MeterProcessState", "..\Common\Service\MeterProcessState\MeterProcessState.csproj", "{1057AD21-BA22-4CAB-B3FE-88C5C9980E6A}"
-EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		..\Common\Utils\FileIoShared\FileIoShared.projitems*{200f4f65-47df-47c6-876f-e91c48799aff}*SharedItemsImports = 13
@@ -1673,48 +1669,6 @@ Global
 		{0F646872-D8DC-4EE5-989F-D4C73F0ACE3F}.XP32bit|x64.Build.0 = Release|Any CPU
 		{0F646872-D8DC-4EE5-989F-D4C73F0ACE3F}.XP32bit|x86.ActiveCfg = Release|Any CPU
 		{0F646872-D8DC-4EE5-989F-D4C73F0ACE3F}.XP32bit|x86.Build.0 = Release|Any CPU
-		{1057AD21-BA22-4CAB-B3FE-88C5C9980E6A}._MANUAL_CONTROL|Any CPU.ActiveCfg = _MANUAL_CONTROL|Any CPU
-		{1057AD21-BA22-4CAB-B3FE-88C5C9980E6A}._MANUAL_CONTROL|Any CPU.Build.0 = _MANUAL_CONTROL|Any CPU
-		{1057AD21-BA22-4CAB-B3FE-88C5C9980E6A}._MANUAL_CONTROL|x64.ActiveCfg = _MANUAL_CONTROL|x64
-		{1057AD21-BA22-4CAB-B3FE-88C5C9980E6A}._MANUAL_CONTROL|x64.Build.0 = _MANUAL_CONTROL|x64
-		{1057AD21-BA22-4CAB-B3FE-88C5C9980E6A}._MANUAL_CONTROL|x86.ActiveCfg = _MANUAL_CONTROL|Any CPU
-		{1057AD21-BA22-4CAB-B3FE-88C5C9980E6A}._MANUAL_CONTROL|x86.Build.0 = _MANUAL_CONTROL|Any CPU
-		{1057AD21-BA22-4CAB-B3FE-88C5C9980E6A}.COM|Any CPU.ActiveCfg = _MANUAL_CONTROL|Any CPU
-		{1057AD21-BA22-4CAB-B3FE-88C5C9980E6A}.COM|Any CPU.Build.0 = _MANUAL_CONTROL|Any CPU
-		{1057AD21-BA22-4CAB-B3FE-88C5C9980E6A}.COM|x64.ActiveCfg = _MANUAL_CONTROL|x64
-		{1057AD21-BA22-4CAB-B3FE-88C5C9980E6A}.COM|x64.Build.0 = _MANUAL_CONTROL|x64
-		{1057AD21-BA22-4CAB-B3FE-88C5C9980E6A}.COM|x86.ActiveCfg = _MANUAL_CONTROL|Any CPU
-		{1057AD21-BA22-4CAB-B3FE-88C5C9980E6A}.COM|x86.Build.0 = _MANUAL_CONTROL|Any CPU
-		{1057AD21-BA22-4CAB-B3FE-88C5C9980E6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1057AD21-BA22-4CAB-B3FE-88C5C9980E6A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1057AD21-BA22-4CAB-B3FE-88C5C9980E6A}.Debug|x64.ActiveCfg = Debug|x64
-		{1057AD21-BA22-4CAB-B3FE-88C5C9980E6A}.Debug|x64.Build.0 = Debug|x64
-		{1057AD21-BA22-4CAB-B3FE-88C5C9980E6A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{1057AD21-BA22-4CAB-B3FE-88C5C9980E6A}.Debug|x86.Build.0 = Debug|Any CPU
-		{1057AD21-BA22-4CAB-B3FE-88C5C9980E6A}.PerformTest|Any CPU.ActiveCfg = _MANUAL_CONTROL|Any CPU
-		{1057AD21-BA22-4CAB-B3FE-88C5C9980E6A}.PerformTest|Any CPU.Build.0 = _MANUAL_CONTROL|Any CPU
-		{1057AD21-BA22-4CAB-B3FE-88C5C9980E6A}.PerformTest|x64.ActiveCfg = _MANUAL_CONTROL|x64
-		{1057AD21-BA22-4CAB-B3FE-88C5C9980E6A}.PerformTest|x64.Build.0 = _MANUAL_CONTROL|x64
-		{1057AD21-BA22-4CAB-B3FE-88C5C9980E6A}.PerformTest|x86.ActiveCfg = _MANUAL_CONTROL|Any CPU
-		{1057AD21-BA22-4CAB-B3FE-88C5C9980E6A}.PerformTest|x86.Build.0 = _MANUAL_CONTROL|Any CPU
-		{1057AD21-BA22-4CAB-B3FE-88C5C9980E6A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1057AD21-BA22-4CAB-B3FE-88C5C9980E6A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1057AD21-BA22-4CAB-B3FE-88C5C9980E6A}.Release|x64.ActiveCfg = Release|x64
-		{1057AD21-BA22-4CAB-B3FE-88C5C9980E6A}.Release|x64.Build.0 = Release|x64
-		{1057AD21-BA22-4CAB-B3FE-88C5C9980E6A}.Release|x86.ActiveCfg = Release|Any CPU
-		{1057AD21-BA22-4CAB-B3FE-88C5C9980E6A}.Release|x86.Build.0 = Release|Any CPU
-		{1057AD21-BA22-4CAB-B3FE-88C5C9980E6A}.ReleaseTest|Any CPU.ActiveCfg = Release|Any CPU
-		{1057AD21-BA22-4CAB-B3FE-88C5C9980E6A}.ReleaseTest|Any CPU.Build.0 = Release|Any CPU
-		{1057AD21-BA22-4CAB-B3FE-88C5C9980E6A}.ReleaseTest|x64.ActiveCfg = Release|x64
-		{1057AD21-BA22-4CAB-B3FE-88C5C9980E6A}.ReleaseTest|x64.Build.0 = Release|x64
-		{1057AD21-BA22-4CAB-B3FE-88C5C9980E6A}.ReleaseTest|x86.ActiveCfg = Release|Any CPU
-		{1057AD21-BA22-4CAB-B3FE-88C5C9980E6A}.ReleaseTest|x86.Build.0 = Release|Any CPU
-		{1057AD21-BA22-4CAB-B3FE-88C5C9980E6A}.XP32bit|Any CPU.ActiveCfg = _MANUAL_CONTROL|Any CPU
-		{1057AD21-BA22-4CAB-B3FE-88C5C9980E6A}.XP32bit|Any CPU.Build.0 = _MANUAL_CONTROL|Any CPU
-		{1057AD21-BA22-4CAB-B3FE-88C5C9980E6A}.XP32bit|x64.ActiveCfg = _MANUAL_CONTROL|x64
-		{1057AD21-BA22-4CAB-B3FE-88C5C9980E6A}.XP32bit|x64.Build.0 = _MANUAL_CONTROL|x64
-		{1057AD21-BA22-4CAB-B3FE-88C5C9980E6A}.XP32bit|x86.ActiveCfg = _MANUAL_CONTROL|Any CPU
-		{1057AD21-BA22-4CAB-B3FE-88C5C9980E6A}.XP32bit|x86.Build.0 = _MANUAL_CONTROL|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1806,8 +1760,6 @@ Global
 		{8BDD2789-96D4-43EA-AAD7-0F49D0347998} = {D3C60972-33C8-41DE-AB17-6CA6F02FBD7A}
 		{1B2609F4-4440-4EB5-AB2B-E3F0B77F59DF} = {C2DC6B5F-DB49-49D8-86D6-B72B5586C167}
 		{0F646872-D8DC-4EE5-989F-D4C73F0ACE3F} = {1B2609F4-4440-4EB5-AB2B-E3F0B77F59DF}
-		{7C0CC530-F1C6-4906-873C-D94041F4D4A2} = {C28B184B-7AE7-4FDC-A9DE-2B9B6577384F}
-		{1057AD21-BA22-4CAB-B3FE-88C5C9980E6A} = {7C0CC530-F1C6-4906-873C-D94041F4D4A2}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {A3EA9D1C-40DE-43F8-9EC8-7657B0D78A00}
diff --git a/ServiceFwUpdate/Ui/ServiceFwUpdateBuilder/Properties/Resources.Designer.cs b/ServiceFwUpdate/Ui/ServiceFwUpdateBuilder/Properties/Resources.Designer.cs
index 0d6672a1..cf9cede3 100644
--- a/ServiceFwUpdate/Ui/ServiceFwUpdateBuilder/Properties/Resources.Designer.cs
+++ b/ServiceFwUpdate/Ui/ServiceFwUpdateBuilder/Properties/Resources.Designer.cs
@@ -126,7 +126,7 @@ namespace Xylem.ServiceFwUpdate.Ui.FwUpdateBuilder.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Failed to download power correction data at EOL for Cordonel:.
+        ///   Looks up a localized string similar to Power correction loading failed for Cordonel:.
         /// </summary>
         internal static string StrCordonelDbEolDataLoadFailed {
             get {
@@ -135,7 +135,7 @@ namespace Xylem.ServiceFwUpdate.Ui.FwUpdateBuilder.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Power correction data at EOL for Cordonel:.
+        ///   Looks up a localized string similar to Power corrections loaded for Cordonel:.
         /// </summary>
         internal static string StrCordonelDbEolDataLoadSucceded {
             get {
@@ -144,7 +144,7 @@ namespace Xylem.ServiceFwUpdate.Ui.FwUpdateBuilder.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cordonel password container added:.
+        ///   Looks up a localized string similar to Cordonel password container added for Cordonel:.
         /// </summary>
         internal static string StrCordonelPwdAdded {
             get {
@@ -162,7 +162,7 @@ namespace Xylem.ServiceFwUpdate.Ui.FwUpdateBuilder.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Recovery register load failed:.
+        ///   Looks up a localized string similar to Recovery register load failed for Cordonel:.
         /// </summary>
         internal static string StrCordonelRecoveryRegisterLoadFailed {
             get {
@@ -171,7 +171,7 @@ namespace Xylem.ServiceFwUpdate.Ui.FwUpdateBuilder.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Recovery registers added:.
+        ///   Looks up a localized string similar to Recovery registers added for Cordonel:.
         /// </summary>
         internal static string StrCordonelRecoveryRegistersAdded {
             get {
diff --git a/ServiceFwUpdate/Ui/ServiceFwUpdateBuilder/Properties/Resources.de.resx b/ServiceFwUpdate/Ui/ServiceFwUpdateBuilder/Properties/Resources.de.resx
index cace0583..701d0943 100644
--- a/ServiceFwUpdate/Ui/ServiceFwUpdateBuilder/Properties/Resources.de.resx
+++ b/ServiceFwUpdate/Ui/ServiceFwUpdateBuilder/Properties/Resources.de.resx
@@ -205,7 +205,7 @@
     <value>Fehlendes FW-Update Paket:</value>
   </data>
   <data name="StrCordonelUpdateCapabilityCheckSuccess" xml:space="preserve">
-    <value>Cordonel Updatefähigkeit erfolgreich überprüft:</value>
+    <value>Updatefähigkeit erfolgreich überprüft für Cordonel:</value>
   </data>
   <data name="StrCordonelUpdateCapabilityCheckFailed" xml:space="preserve">
     <value>KEIN UPDATE MÖGLICH FÜR AUSGEWÄHLTE KOMBINATION FÜR CORDONEL:</value>
@@ -217,7 +217,7 @@
     <value>Fehlender Paßwortcontainer für Cordonel: </value>
   </data>
   <data name="StrCordonelPwdAdded" xml:space="preserve">
-    <value>Cordonel Paßwortcontainer hinzugefügt:</value>
+    <value>Paßwortcontainer hinzugefügt für Cordonel:</value>
   </data>
   <data name="StrUserInformationMissing" xml:space="preserve">
     <value>Fehlende Information zum Benutzer!</value>
@@ -406,10 +406,10 @@
     <value>Region</value>
   </data>
   <data name="StrCordonelRecoveryRegisterLoadFailed" xml:space="preserve">
-    <value>Wiederherstellungen laden fehlgeschlagen:</value>
+    <value>Wiederherstellungen laden fehlerhaft für Cordonel:</value>
   </data>
   <data name="StrCordonelRecoveryRegistersAdded" xml:space="preserve">
-    <value>Wiederherstellungen geladen:</value>
+    <value>Wiederherstellungen geladen für Cordonel:</value>
   </data>
   <data name="StrTableRegisterRestoreSelect" xml:space="preserve">
     <value>Werkseinstellungen wiederherstellen</value>
@@ -427,9 +427,9 @@
     <value>Diesen neuen FW-Update Safe zur Datenbank hochladen?</value>
   </data>
   <data name="StrCordonelDbEolDataLoadFailed" xml:space="preserve">
-    <value>Verbrauchskorrekturparameter laden fehlgeschlagen für Cordonel:</value>
+    <value>Verbrauchskorrektur laden fehlerhaft für Cordonel:</value>
   </data>
   <data name="StrCordonelDbEolDataLoadSucceded" xml:space="preserve">
-    <value>Verbrauchskorrekturparameter geladen für Cordonel:</value>
+    <value>Verbrauchskorrektur geladen für Cordonel:</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/ServiceFwUpdate/Ui/ServiceFwUpdateBuilder/Properties/Resources.resx b/ServiceFwUpdate/Ui/ServiceFwUpdateBuilder/Properties/Resources.resx
index 59e9d16c..d16587a6 100644
--- a/ServiceFwUpdate/Ui/ServiceFwUpdateBuilder/Properties/Resources.resx
+++ b/ServiceFwUpdate/Ui/ServiceFwUpdateBuilder/Properties/Resources.resx
@@ -217,7 +217,7 @@
     <value>Missing password container for Cordonel:</value>
   </data>
   <data name="StrCordonelPwdAdded" xml:space="preserve">
-    <value>Cordonel password container added:</value>
+    <value>Cordonel password container added for Cordonel:</value>
   </data>
   <data name="StrUserInformationMissing" xml:space="preserve">
     <value>Missing user information!</value>
@@ -413,10 +413,10 @@
     <value>Region</value>
   </data>
   <data name="StrCordonelRecoveryRegisterLoadFailed" xml:space="preserve">
-    <value>Recovery register load failed:</value>
+    <value>Recovery register load failed for Cordonel:</value>
   </data>
   <data name="StrCordonelRecoveryRegistersAdded" xml:space="preserve">
-    <value>Recovery registers added:</value>
+    <value>Recovery registers added for Cordonel:</value>
   </data>
   <data name="StrTableRegisterRestoreSelect" xml:space="preserve">
     <value>Factory Reset</value>
@@ -434,9 +434,9 @@
     <value>Upload this new FW-Update Safe to data base?</value>
   </data>
   <data name="StrCordonelDbEolDataLoadFailed" xml:space="preserve">
-    <value>Failed to download power correction data at EOL for Cordonel:</value>
+    <value>Power correction loading failed for Cordonel:</value>
   </data>
   <data name="StrCordonelDbEolDataLoadSucceded" xml:space="preserve">
-    <value>Power correction data at EOL for Cordonel:</value>
+    <value>Power corrections loaded for Cordonel:</value>
   </data>
 </root>
\ No newline at end of file