diff --git a/MP.Data/Controllers/MpIocController.cs b/MP.Data/Controllers/MpIocController.cs
index 907fdb53..f2520dfa 100644
--- a/MP.Data/Controllers/MpIocController.cs
+++ b/MP.Data/Controllers/MpIocController.cs
@@ -15,8 +15,6 @@ namespace MP.Data.Controllers
 {
     public class MpIocController
     {
-        protected readonly IDbContextFactory<MoonProContext> _ctxFactory;
-        protected readonly IDbContextFactory<MoonPro_FluxContext> _ctxFactoryFL;
         #region Public Constructors
 
         public MpIocController(
@@ -524,30 +522,6 @@ namespace MP.Data.Controllers
                             .ToListAsync();
         }
 
-#if false
-        /// <summary>
-        /// Elenco ultimi n record flux log dato macchina e flusso (ordinato x data registrazione)
-        /// </summary>
-        /// <param name="DtMax">Data massima x eventi</param>
-        /// <param name="DtMin">Data minima x eventi</param>
-        /// <param name="IdxMacchina">* = tutte, altrimenti solo x una data macchina</param>
-        /// <param name="CodFlux">*=tutti, altrimenti solo selezionato</param>
-        /// <param name="MaxRec">numero massimo record da restituire</param>
-        /// <returns></returns>
-        public async Task<List<FluxLogModel>> FluxLogGetLastFiltAsync(DateTime DtMax, DateTime DtMin, string IdxMacchina, string CodFlux, int MaxRec)
-        {
-            using var dbCtx = await _ctxFactoryFL.CreateDbContextAsync();
-
-            return await dbCtx
-                            .DbSetFluxLog
-                            .AsNoTracking()
-                            .Where(x => (x.dtEvento >= DtMin && x.dtEvento <= DtMax) && (IdxMacchina == "*" || x.IdxMacchina == IdxMacchina) && (CodFlux == "*" || x.CodFlux == CodFlux))
-                            .OrderByDescending(x => x.dtEvento)
-                            .Take(MaxRec)
-                            .ToListAsync();
-        } 
-#endif
-
         /// <summary>
         /// Aggiunta record FluxLog
         /// </summary>
@@ -561,7 +535,6 @@ namespace MP.Data.Controllers
                             .DbSetFluxLog
                             .Add(newRec);
             return await dbCtx.SaveChangesAsync() > 0;
-
         }
 
         /// <summary>
@@ -583,268 +556,6 @@ namespace MP.Data.Controllers
             return result > 0;
         }
 
-#if false
-        /// <summary>
-        /// Upsert record keepalive
-        /// </summary>
-        /// <param name="IdxMacc"></param>
-        /// <param name="OraServer"></param>
-        /// <param name="OraMacc"></param>
-        /// <returns></returns>
-        public async Task<bool> KeepAliveUpsertAsync(string IdxMacc, DateTime OraServer, DateTime OraMacc)
-        {
-            bool fatto = false;
-            using var dbCtx = _ctxFactory.CreateDbContext();
-
-            var currRec = await dbCtx
-                            .DbSetKeepAlive
-                            .Where(x => x.IdxMacchina == IdxMacc)
-                            .FirstOrDefaultAsync();
-            if (currRec != null)
-            {
-                currRec.DataOraServer = OraServer;
-                currRec.DataOraMacchina = OraMacc;
-                dbCtx.Entry(currRec).State = EntityState.Modified;
-            }
-            else
-            {
-                KeepAliveModel newRec = new KeepAliveModel()
-                {
-                    IdxMacchina = IdxMacc,
-                    DataOraMacchina = OraMacc,
-                    DataOraServer = OraServer,
-                    DataOraStart = DateTime.Now
-                };
-                dbCtx
-                    .DbSetKeepAlive
-                    .Add(newRec);
-            }
-            fatto = await dbCtx.SaveChangesAsync() > 0;
-
-            return fatto;
-        } 
-
-        public async Task<List<LinkMenuModel>> ListLinkFiltAsync(string tipoLink)
-        {
-            List<LinkMenuModel> dbResult = new List<LinkMenuModel>();
-            using var dbCtx = _ctxFactory.CreateDbContext();
-
-            dbResult = await dbCtx
-                                .DbSetLinkMenu
-                                .Where(x => x.TipoLink == tipoLink)
-                                .AsNoTracking()
-                                .OrderBy(x => x.Ordine)
-                                .ToListAsync();
-            return dbResult;
-        }
-
-        /// <summary>
-        /// Elenco valori ammessi x tabella/colonna con filtro parametrico
-        /// </summary>
-        /// <param name="tabName">Filtro tabella (se "" tutto)</param>
-        /// <param name="fieldName">Filtro colonna (se "" tutto)</param>
-        /// <returns></returns>
-        public async Task<List<ListValuesModel>> ListValuesFiltAsync(string tabName, string fieldName)
-        {
-            List<ListValuesModel> dbResult = new List<ListValuesModel>();
-            using var dbCtx = _ctxFactory.CreateDbContext();
-
-            var query = dbCtx
-                            .DbSetListValues
-                            .AsNoTracking()
-                            .AsQueryable();
-
-            if (!string.IsNullOrEmpty(tabName))
-                query = query.Where(x => x.TableName == tabName);
-            if (!string.IsNullOrEmpty(fieldName))
-                query = query.Where(x => x.FieldName == fieldName);
-
-            dbResult = await query.ToListAsync();
-
-            return dbResult;
-        }
-
-        /// <summary>
-        /// Intera tabella relazione master/slave in machine (gestione setup master - slave)
-        /// </summary>
-        /// <returns></returns>
-        public async Task<List<Macchine2SlaveModel>> Macchine2SlaveAsync()
-        {
-            List<Macchine2SlaveModel> dbResult = new List<Macchine2SlaveModel>();
-            using var dbCtx = _ctxFactory.CreateDbContext();
-
-            dbResult = await dbCtx
-                                .DbSetM2S
-                                .AsNoTracking()
-                                .OrderBy(x => x.IdxMacchina)
-                                .ToListAsync();
-
-            return dbResult;
-        }
-
-        /// <summary>
-        /// Elenco Record Macchine
-        /// </summary>
-        /// <returns></returns>
-        public async Task<List<MacchineModel>> MacchineGetAllAsync()
-        {
-            List<MacchineModel> dbResult = new List<MacchineModel>();
-            using var dbCtx = _ctxFactory.CreateDbContext();
-
-            dbResult = await dbCtx
-                            .DbSetMacchine
-                            .ToListAsync();
-
-            return dbResult;
-        }
-
-        public async Task<MacchineModel?> MacchineGetByIdxAsync(string IdxMacchina)
-        {
-            MacchineModel dbResult = null;
-            using var dbCtx = _ctxFactory.CreateDbContext();
-
-            dbResult = await dbCtx
-                            .DbSetMacchine
-                            .FirstOrDefaultAsync(x => x.IdxMacchina == IdxMacchina);
-
-            return dbResult;
-        }
-
-        /// <summary>
-        /// Elenco da tabella Macchine
-        /// </summary>
-        /// <param name="codGruppo"></param>
-        /// <returns></returns>
-        public async Task<List<MacchineModel>> MacchineGetFiltAsync(string codGruppo)
-        {
-            List<MacchineModel> dbResult = new List<MacchineModel>();
-            using var dbCtx = _ctxFactory.CreateDbContext();
-
-            if (codGruppo == "*")
-            {
-                dbResult = await dbCtx
-                                .DbSetMacchine
-                                .AsNoTracking()
-                                .OrderBy(x => x.IdxMacchina)
-                                .ToListAsync();
-            }
-            else
-            {
-                dbResult = await dbCtx
-                                .DbSetGrp2Macc
-                                .Where(g => g.CodGruppo == codGruppo)
-                                .Join(dbCtx.DbSetMacchine,
-                                    g => g.IdxMacchina,
-                                    m => m.IdxMacchina,
-                                    (g, m) => m
-                                )
-                                .AsNoTracking()
-                                .OrderBy(x => x.IdxMacchina)
-                                .ToListAsync();
-            }
-
-            return dbResult;
-        }
-
-        /// <summary>
-        /// Upsert Record Macchine ASYNC
-        /// </summary>
-        /// <returns></returns>
-        public async Task<bool> MacchineUpsertAsync(MacchineModel entity)
-        {
-            using var dbCtx = _ctxFactory.CreateDbContext();
-
-            // Recuperiamo l'entità tracciata dal context
-            var trackedEntity = await dbCtx
-                                            .DbSetMacchine
-                                            .FirstOrDefaultAsync(x => x.IdxMacchina == entity.IdxMacchina);
-
-            if (trackedEntity != null)
-            {
-                // Aggiorna i valori dell'entità tracciata con quelli della nuova
-                dbCtx.Entry(trackedEntity).CurrentValues.SetValues(entity);
-            }
-            else
-            {
-                dbCtx.DbSetMacchine.Update(entity);
-            }
-            bool fatto = await dbCtx.SaveChangesAsync() > 0;
-            return fatto;
-        }
-
-        /// <summary>
-        /// Elenco da tabella Macchine
-        /// </summary>
-        /// <param name="IdxMacc"></param>
-        /// <returns></returns>
-        public async Task<List<MicroStatoMacchinaModel>> MicroStatoMacchinaGetByIdxMaccAsync(string IdxMacc)
-        {
-            List<MicroStatoMacchinaModel> dbResult = new List<MicroStatoMacchinaModel>();
-            using var dbCtx = _ctxFactory.CreateDbContext();
-
-            dbResult = await dbCtx
-                                .DbSetMicroStatoMacc
-                                .Where(x => x.IdxMacchina == IdxMacc)
-                                .AsNoTracking()
-                                .ToListAsync();
-            return dbResult;
-        }
-
-        /// <summary>
-        /// Aggiornamento record Microstato macchina
-        /// </summary>
-        /// <param name="newRec"></param>
-        /// <returns></returns>
-        public async Task<bool> MicroStatoMacchinaUpsertAsync(MicroStatoMacchinaModel newRec)
-        {
-            bool fatto = false;
-            using var dbCtx = _ctxFactory.CreateDbContext();
-
-            var actRec = await dbCtx
-                                .DbSetMicroStatoMacc
-                                .Where(x => x.IdxMacchina == newRec.IdxMacchina)
-                                .AsNoTracking()
-                                .FirstOrDefaultAsync();
-            if (actRec == null)
-            {
-                dbCtx
-                    .DbSetMicroStatoMacc
-                    .Add(newRec);
-            }
-            else
-            {
-                actRec.IdxMicroStato = newRec.IdxMicroStato;
-                actRec.InizioStato = newRec.InizioStato;
-                actRec.Value = newRec.Value;
-
-                dbCtx.Entry(actRec).State = EntityState.Modified;
-            }
-            fatto = await dbCtx.SaveChangesAsync() > 0;
-
-            return fatto;
-        }
-
-        /// <summary>
-        /// Elenco da tabella MappaStatoExplModel
-        /// </summary>
-        /// <returns></returns>
-        public async Task<List<MappaStatoExplModel>> MseGetAllAsync(int maxAge = 2000)
-        {
-            List<MappaStatoExplModel> dbResult = new List<MappaStatoExplModel>();
-            using var dbCtx = _ctxFactory.CreateDbContext();
-
-            var maxAgeSec = new SqlParameter("@maxAgeSec", maxAge);
-
-            dbResult = await dbCtx
-                            .DbSetMSE
-                            .FromSqlRaw("EXEC stp_MSE_getData @maxAgeSec", maxAgeSec)
-                            .AsNoTracking()
-                            .ToListAsync();
-
-            return dbResult;
-        }
-#endif
-
         /// <summary>
         /// Generazione automatica ODL
         /// </summary>
@@ -917,54 +628,6 @@ namespace MP.Data.Controllers
             return answ;
         }
 
-#if false
-        /// <summary>
-        /// Fix ODL per macchine SLAVE
-        /// </summary>
-        /// <param name="idxMacchina"></param>
-        /// <param name="numDayPrev"></param>
-        /// <param name="doInsert"></param>
-        /// <returns></returns>
-        public async Task<bool> OdlFixMachineSlave(string idxMacchina, int numDayPrev, int doInsert)
-        {
-            using var dbCtx = _ctxFactory.CreateDbContext();
-
-            var idxMaccParam = new SqlParameter("@IdxMacchina", idxMacchina ?? "");
-            var numDayPrevParam = new SqlParameter("@NumDayPrev", numDayPrev);
-            var doInsertParam = new SqlParameter("@DoInsert", doInsert);
-
-            var result = await dbCtx
-                                .Database
-                                .ExecuteSqlRawAsync("EXEC stp_ODL_fixMachineSlave @IdxMacchina, @NumDayPrev, @DoInsert", idxMaccParam, numDayPrevParam, doInsertParam);
-
-            return result != -1;
-        } 
-
-        /// <summary>
-        /// Elenco ODL data macchina e periodo
-        /// </summary>
-        /// <param name="idxMacchina"></param>
-        /// <param name="dtStart"></param>
-        /// <param name="dtEnd"></param>
-        /// <returns></returns>
-        public async Task<List<ODLExpModel>> OdlListByMaccPeriodoAsync(string idxMacchina, DateTime dtStart, DateTime dtEnd)
-        {
-            List<ODLExpModel> dbResult = new List<ODLExpModel>();
-            using var dbCtx = _ctxFactory.CreateDbContext();
-
-            var IdxMacchina = new SqlParameter("@IdxMacchina", idxMacchina);
-            var DataFrom = new SqlParameter("@dataFrom", dtStart);
-            var DataTo = new SqlParameter("@dataTo", dtEnd);
-            dbResult = await dbCtx
-                            .DbSetODLExp
-                            .FromSqlRaw("EXEC stp_ODL_getByMacchinaPeriodo @IdxMacchina, @dataFrom, @dataTo", IdxMacchina, DataFrom, DataTo)
-                            .AsNoTracking()
-                            .ToListAsync();
-
-            return dbResult;
-        }
-#endif
-
         /// <summary>
         /// Fix ODL per macchine SLAVE Async
         /// </summary>
@@ -1007,7 +670,6 @@ namespace MP.Data.Controllers
             return answ;
         }
 
-
         /// <summary>
         /// Conteggio PzProd Macchina Async
         /// </summary>
@@ -1192,183 +854,6 @@ namespace MP.Data.Controllers
             return fatto;
         }
 
-#if false
-        /// <summary>
-        /// Update record Registro Dichiarazioni
-        /// </summary>
-        /// <param name="newRec"></param>
-        /// <returns></returns>
-        public async Task<bool> RegDichiarUpdateAsync(RegistroDichiarazioniModel newRec)
-        {
-            using var dbCtx = _ctxFactory.CreateDbContext();
-
-            var Original_IdxDich = new SqlParameter("@Original_IdxDich", newRec.IdxDich);
-            var DtRec = new SqlParameter("@DtRec", newRec.DtRec);
-            var TagCode = new SqlParameter("@TagCode", newRec.TagCode);
-            var ValString = new SqlParameter("@ValString", newRec.ValString);
-            var MatrOpr = new SqlParameter("@MatrOpr", newRec.MatrOpr);
-            var result = await dbCtx
-                             .Database
-                             .ExecuteSqlRawAsync("exec dbo.stp_DD_updateQuery @Original_IdxDich, @DtRec, @TagCode, @ValString, @MatrOpr", Original_IdxDich, DtRec, TagCode, ValString, MatrOpr);
-
-            return result != 0;
-        }
-
-        /// <summary>
-        /// Aggiunta record RemoteRebootLog
-        /// </summary>
-        /// <param name="newRec"></param>
-        /// <returns></returns>
-        public async Task<bool> RemRebootLogAddAsync(RemoteRebootLogModel newRec)
-        {
-            using var dbCtx = _ctxFactory.CreateDbContext();
-
-            var dbResult = dbCtx
-                                 .DbSetRemRebLog
-                                 .Add(newRec);
-
-            return await dbCtx.SaveChangesAsync() > 0;
-        }
-
-        /// <summary>
-        /// Recupera tutti i record di RemoteRebootLog
-        /// </summary>
-        /// <returns></returns>
-        public async Task<List<RemoteRebootLogModel>> RemRebootLogGetAllAsync()
-        {
-            using var dbCtx = _ctxFactory.CreateDbContext();
-
-            var dbResult = await dbCtx
-                                .DbSetRemRebLog
-                                .AsNoTracking()
-                                .OrderByDescending(x => x.IdxReboot)
-                                .ToListAsync();
-            return dbResult;
-        }
-
-        /// <summary>
-        /// Recupera ultimo record x ogni IdxMacchina x avere ultimo attivo
-        /// </summary>
-        /// <returns></returns>
-        public async Task<List<RemoteRebootLogModel>> RemRebootLogGetLastAsync()
-        {
-            using var dbCtx = _ctxFactory.CreateDbContext();
-            var dbResult = await dbCtx
-                             .DbSetRemRebLog
-                             .FromSqlRaw("EXEC stp_RRL_getLast")
-                             .AsNoTracking()
-                             .ToListAsync();
-            return dbResult;
-        }
-
-        /// <summary>
-        /// Recupera ultimo record x ogni IdxMacchina x avere ultimo attivo
-        /// </summary>
-        /// <returns></returns>
-        public async Task<bool> RemRebootLogKeepLastAsync(int num2keep)
-        {
-            using var dbCtx = _ctxFactory.CreateDbContext();
-
-            var pNum2Keep = new SqlParameter("@num2keep", num2keep);
-            // La SP gestisce già la logica di soglia (1.5x), ma la specifico x sicurezza
-            var pThresh = new SqlParameter("@threshMult", 1.5);
-            var dbResult = await dbCtx.Database.ExecuteSqlRawAsync(
-                "EXEC dbo.stp_RRL_KeepLatest @num2keep, @threshMult", pNum2Keep, pThresh);
-
-            return dbResult != 0;
-        }
-
-        /// <summary>
-        /// Aggiunta record SignalLog Async
-        /// </summary>
-        /// <param name="newRec"></param>
-        /// <returns></returns>
-        public async Task<bool> SignalLogInsertAsync(SignalLogModel newRec)
-        {
-            using var dbCtx = _ctxFactory.CreateDbContext();
-
-            var currRec = dbCtx
-                            .DbSetSignalLog
-                            .Add(newRec);
-
-            return await dbCtx.SaveChangesAsync() > 0;
-        }
-
-        /// <summary>
-        /// Tabella state machine eventi 2 stati data macchina e tipo evento
-        /// </summary>
-        /// <param name="idxTipo"></param>
-        /// <returns></returns>
-        public async Task<List<TransizioneStatiModel>> SMES_getHwTransitionsAsync(string idxMacchina, int idxTipo)
-        {
-            using var dbCtx = _ctxFactory.CreateDbContext();
-
-            var IdxMacchina = new SqlParameter("@IdxMacchina", idxMacchina);
-            var IdxTipo = new SqlParameter("@IdxTipo", idxTipo);
-            var dbResult = await dbCtx
-                              .DbSetSMES
-                              .FromSqlRaw("exec dbo.stp_TS_getByIdxMacchIdxTipoEv @IdxMacchina, @IdxTipo", IdxMacchina, IdxTipo)
-                              .AsNoTracking()
-                              .ToListAsync();
-
-            return dbResult;
-        }
-
-        /// <summary>
-        /// Tabella state machine eventi 2 stati data macchina e tipo evento
-        /// </summary>
-        /// <param name="idxTipo"></param>
-        /// <returns></returns>
-        public async Task<List<TransizioneStatiModel>> SMES_getUserForcedAsync(string idxMacchina, int idxTipo)
-        {
-            await using var dbCtx = _ctxFactory.CreateDbContext();
-
-            var IdxMacchina = new SqlParameter("@IdxMacchina", idxMacchina);
-            var IdxTipo = new SqlParameter("@IdxTipo", idxTipo);
-            var dbResult = await dbCtx
-                                .DbSetSMES
-                                .FromSqlRaw("exec dbo.stp_TS_getUserForcedTrans @IdxMacchina, @IdxTipo", IdxMacchina, IdxTipo)
-                                .AsNoTracking()
-                                .ToListAsync();
-
-            return dbResult;
-        }
-
-        /// <summary>
-        /// Intera tabella state machine ingressi 2 eventi
-        /// </summary>
-        /// <returns></returns>
-        public List<TransizioneIngressiModel> StateMachineIngressi(int idxFam)
-        {
-            using var dbCtx = _ctxFactory.CreateDbContext();
-            var IdxFamIn = new SqlParameter("@IdxFamigliaIngresso", idxFam);
-            return dbCtx
-                    .DbSetSMI
-                    .FromSqlRaw("exec dbo.stp_TRI_getByIdxFamIng @IdxFamigliaIngresso", IdxFamIn)
-                    .AsNoTracking()
-                    .AsEnumerable()
-                    .ToList();
-        }
-
-        /// <summary>
-        /// Intera tabella state machine ingressi 2 eventi
-        /// </summary>
-        /// <returns></returns>
-        public async Task<List<TransizioneIngressiModel>> StateMachineIngressiAsync(int idxFam)
-        {
-            using var dbCtx = _ctxFactory.CreateDbContext();
-
-            var IdxFamIn = new SqlParameter("@IdxFamigliaIngresso", idxFam);
-            var dbResult = await dbCtx
-                                    .DbSetSMI
-                                    .FromSqlRaw("exec dbo.stp_TRI_getByIdxFamIng @IdxFamigliaIngresso", IdxFamIn)
-                                    .AsNoTracking()
-                                    .ToListAsync();
-
-            return dbResult;
-        }
-#endif
-
         /// <summary>
         /// Stato prod macchina (completo) Async
         /// </summary>
@@ -1450,7 +935,15 @@ namespace MP.Data.Controllers
 
         #endregion Public Methods
 
+        #region Protected Fields
+
+        protected readonly IDbContextFactory<MoonProContext> _ctxFactory;
+        protected readonly IDbContextFactory<MoonPro_FluxContext> _ctxFactoryFL;
+
+        #endregion Protected Fields
+
         #region Private Fields
+
         private static NLog.Logger Log = LogManager.GetCurrentClassLogger();
         private DbContextOptions<MoonPro_FluxContext> optionsFlux;