diff --git a/serverRoot/src/main/servlet/org/compiere/web/AdempiereMonitor.java b/serverRoot/src/main/servlet/org/compiere/web/AdempiereMonitor.java
index d9c29efdb4..fefe78edbc 100644
--- a/serverRoot/src/main/servlet/org/compiere/web/AdempiereMonitor.java
+++ b/serverRoot/src/main/servlet/org/compiere/web/AdempiereMonitor.java
@@ -16,20 +16,63 @@
  *****************************************************************************/
 package org.compiere.web;
 
-import java.io.*;
-import java.lang.management.*;
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import org.apache.ecs.*;
-import org.apache.ecs.xhtml.*;
-import org.compiere.*;
-import org.compiere.db.*;
-import org.compiere.model.*;
-import org.compiere.server.*;
-import org.compiere.util.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.lang.management.ManagementFactory;
+import java.lang.management.MemoryMXBean;
+import java.lang.management.RuntimeMXBean;
+import java.lang.management.ThreadMXBean;
+import java.sql.Timestamp;
+import java.util.Properties;
+import java.util.logging.Level;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.ecs.HtmlColor;
+import org.apache.ecs.xhtml.a;
+import org.apache.ecs.xhtml.b;
+import org.apache.ecs.xhtml.body;
+import org.apache.ecs.xhtml.br;
+import org.apache.ecs.xhtml.font;
+import org.apache.ecs.xhtml.form;
+import org.apache.ecs.xhtml.h2;
+import org.apache.ecs.xhtml.hr;
+import org.apache.ecs.xhtml.input;
+import org.apache.ecs.xhtml.label;
+import org.apache.ecs.xhtml.option;
+import org.apache.ecs.xhtml.p;
+import org.apache.ecs.xhtml.select;
+import org.apache.ecs.xhtml.strong;
+import org.apache.ecs.xhtml.table;
+import org.apache.ecs.xhtml.td;
+import org.apache.ecs.xhtml.th;
+import org.apache.ecs.xhtml.tr;
+import org.compiere.Adempiere;
+import org.compiere.db.AdempiereDatabase;
+import org.compiere.db.CConnection;
+import org.compiere.model.AdempiereProcessorLog;
+import org.compiere.model.MClient;
+import org.compiere.model.MStore;
+import org.compiere.model.MSystem;
+import org.compiere.server.AdempiereServer;
+import org.compiere.server.AdempiereServerMgr;
+import org.compiere.util.CLogFile;
+import org.compiere.util.CLogMgt;
+import org.compiere.util.CLogger;
+import org.compiere.util.CMemoryUsage;
+import org.compiere.util.CacheMgt;
+import org.compiere.util.Ini;
+import org.compiere.util.TimeUtil;
+import org.compiere.util.Trx;
+import org.compiere.util.WebDoc;
+import org.compiere.util.WebEnv;
+import org.compiere.util.WebUtil;
 
 /**
  *	Adempiere Server Monitor
diff --git a/serverRoot/src/main/servlet/org/compiere/web/AdempiereMonitorFilter.java b/serverRoot/src/main/servlet/org/compiere/web/AdempiereMonitorFilter.java
index fc7607dd5f..aa59914c74 100644
--- a/serverRoot/src/main/servlet/org/compiere/web/AdempiereMonitorFilter.java
+++ b/serverRoot/src/main/servlet/org/compiere/web/AdempiereMonitorFilter.java
@@ -16,14 +16,24 @@
  *****************************************************************************/
 package org.compiere.web;
 
-import java.io.*;
-import java.util.logging.*;
-import javax.servlet.*;
+import java.io.IOException;
+import java.util.logging.Level;
+
 import javax.servlet.Filter;
-import javax.servlet.http.*;
-import org.compiere.model.*;
-import org.compiere.util.*;
-import sun.misc.*;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.compiere.model.MUser;
+import org.compiere.util.CLogger;
+import org.compiere.util.Env;
+
+import sun.misc.BASE64Decoder;
 
 /**
  * 	Adempiere Monitor Filter.
diff --git a/serverRoot/src/main/servlet/org/compiere/web/ServerStatus.java b/serverRoot/src/main/servlet/org/compiere/web/ServerStatus.java
index 95ef842027..b75f8491af 100644
--- a/serverRoot/src/main/servlet/org/compiere/web/ServerStatus.java
+++ b/serverRoot/src/main/servlet/org/compiere/web/ServerStatus.java
@@ -16,10 +16,13 @@
  *****************************************************************************/
 package org.compiere.web;
 
-import java.io.*;
+import java.io.IOException;
 
-import javax.servlet.*;
-import javax.servlet.http.*;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 
 /**
diff --git a/serverRoot/src/main/servlet/org/compiere/web/StatusInfo.java b/serverRoot/src/main/servlet/org/compiere/web/StatusInfo.java
index 35d6a7826d..e55f00c40c 100644
--- a/serverRoot/src/main/servlet/org/compiere/web/StatusInfo.java
+++ b/serverRoot/src/main/servlet/org/compiere/web/StatusInfo.java
@@ -16,15 +16,21 @@
  *****************************************************************************/
 package org.compiere.web;
 
-import javax.servlet.*;
-import javax.servlet.http.*;
-import java.io.*;
-import javax.naming.*;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
 
-import javax.sql.*;
-import java.sql.*;
+import javax.naming.InitialContext;
+import javax.naming.NamingEnumeration;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.sql.DataSource;
 
-import org.compiere.interfaces.*;
+import org.compiere.interfaces.Server;
+import org.compiere.interfaces.Status;
 
 /**
  *	Status Info Servlet