diff --git a/MTC_Adapter/MTC_Adapter/AdapterGeneric.cs b/MTC_Adapter/MTC_Adapter/AdapterGeneric.cs
index 2acde2c..b63b7e9 100644
--- a/MTC_Adapter/MTC_Adapter/AdapterGeneric.cs
+++ b/MTC_Adapter/MTC_Adapter/AdapterGeneric.cs
@@ -984,6 +984,7 @@ namespace MTC_Adapter
             mAdapter.AddDataItem(mAvail);
             mAvail.Value = "AVAILABLE";
             mMessage.Value = "";
+            mMessage.Code = "";
 
             // assets
             mAdapter.AddDataItem(mAssetChg);
@@ -1730,27 +1731,14 @@ namespace MTC_Adapter
                 if (codiceM != "")
                 {
                     vettPath[i].mPathCodM.Value = string.Format("[M{0}]", codiceM);
-#if false
-                    mMessage.Code = string.Format("[M{0}]", codiceM);
-                    mMessage.Value = string.Format("[M{0}]", codiceM); 
-#endif
                 }
                 if (codiceS != "")
                 {
                     vettPath[i].mPathCodS.Value = string.Format("[S{0}]", codiceS);
-#if false
-                    mMessage.Code = string.Format("[S{0}]", codiceS);
-                    mMessage.Value = string.Format("[S{0}]", codiceS);
-
-#endif
                 }
                 if (codiceT != "")
                 {
                     vettPath[i].mPathCodT.Value = string.Format("[T{0}]", codiceT);
-#if false
-                    mMessage.Code = string.Format("[T{0}]", codiceT);
-                    mMessage.Value = string.Format("[T{0}]", codiceT); 
-#endif
                 }
             }
         }