diff --git a/MTC_Adapter/SCMA/AdapterGeneric.cs b/MTC_Adapter/SCMA/AdapterGeneric.cs
index 4cb2178..dc05c05 100644
--- a/MTC_Adapter/SCMA/AdapterGeneric.cs
+++ b/MTC_Adapter/SCMA/AdapterGeneric.cs
@@ -680,36 +680,18 @@ namespace SCMA
     /// <param name="adpConf"></param>
     private void addItemsToGateway(AdapterConf adpConf)
     {
-      // item disponibilità
-#if false
-      currGateway.addItemNode("AVAIL", mAvail);
-      mAvail.Value = "AVAILABLE"; 
-#endif
+      // item disponibilità    
+      currGateway.addItemNodeAndSet("AVAIL", itemType.Event, availStatus.AVAILABLE.ToString());
       mMessage.Value = "";
-
-
-#if false
-      currGateway.addItemNodeByType("AVAIL", itemType.Event);
-      currGateway.updateItemNodeValue("AVAIL", "AVAILABLE"); 
-#endif
-      currGateway.addItemNodeAndSet("AVAIL", itemType.Event, "AVAILABLE");
-
-
+                               
       // assets 
-      currGateway.addItemNodeByType("MTC_asset_chg", itemType.Event);
-      currGateway.addItemNodeByType("MTC_asset_rem", itemType.Event);
-      currGateway.updateItemNodeValue("MTC_asset_chg", "");
-      currGateway.updateItemNodeValue("MTC_asset_rem", "");
+      currGateway.addItemNodeAndSet("MTC_asset_chg", itemType.Event,"");
+      currGateway.addItemNodeAndSet("MTC_asset_rem", itemType.Event,"");    
 
       // status, clock, emergency stop                            
-      currGateway.addItemNodeByType("E_STOP", itemType.Event);
-      currGateway.addItemNodeByType("STATUS", itemType.Event);
-      currGateway.updateItemNodeValue("E_STOP", "");
-      currGateway.updateItemNodeValue("STATUS", "");
-#if false
-      currGateway.addItemNode(mStatus); 
-      currGateway.addItemNode(mEStop);
-#endif
+      currGateway.addItemNodeAndSet("E_STOP", itemType.Event, availStatus.UNAVAILABLE.ToString());
+      currGateway.addItemNodeAndSet("STATUS", itemType.Event, availStatus.UNAVAILABLE.ToString());  
+
       currGateway.addItemNode(mAccTime);
       currGateway.addItemNode(mAccTimeWork);
       currGateway.addItemNode(mSlittaTast);
@@ -1288,21 +1270,7 @@ namespace SCMA
     #endregion
 
     #region MTConnect.Events & MTConnect.Samples
-
-#if false
-    /// <summary>
-    /// D.D1.AVAIL - disponibilità
-    /// </summary>
-    public MTConnect.Event mAvail = new MTConnect.Event("AVAIL");
-    /// <summary>
-    /// XX.XX.STOP - stop per pressione emergenze
-    /// </summary>
-    public MTConnect.Event mEStop = new MTConnect.Event("E_STOP");
-    /// <summary>
-    /// STATUS "logico" adapter macchina (ON/OFF) 
-    /// </summary>
-    public MTConnect.Event mStatus = new MTConnect.Event("STATUS"); 
-#endif
+                        
     /// <summary>
     /// Minuti accensione globale macchina
     /// </summary>
@@ -2211,9 +2179,11 @@ namespace SCMA
       // imposto continuamente valore assetChange/removal x TESGING !!!FARE!!! togliere   
       int sCount = DateTime.Now.Second;
 
+#if false
       // variabili assets...
       currGateway.updateItemNodeValue("MTC_asset_chg", sCount.ToString());
-      currGateway.updateItemNodeValue("MTC_asset_rem", (1000 + sCount).ToString());
+      currGateway.updateItemNodeValue("MTC_asset_rem", (1000 + sCount).ToString()); 
+#endif
 
       // status, clock, emergency stop li "giro " a turno...     
       if (sCount % 5 == 0)