diff --git a/serverRoot/src/main/ejb/org/compiere/session/ServerBean.java b/serverRoot/src/main/ejb/org/compiere/session/ServerBean.java
index 6946b6f6d7..c89a97dbdd 100644
--- a/serverRoot/src/main/ejb/org/compiere/session/ServerBean.java
+++ b/serverRoot/src/main/ejb/org/compiere/session/ServerBean.java
@@ -16,24 +16,33 @@
  *****************************************************************************/
 package org.compiere.session;
 
-import java.util.*;
-import java.util.logging.*;
+import java.util.Properties;
+import java.util.logging.Level;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.security.DeclareRoles;
 import javax.annotation.security.PermitAll;
 import javax.annotation.security.RolesAllowed;
-import javax.ejb.*;
+import javax.ejb.CreateException;
+import javax.ejb.Local;
+import javax.ejb.Remote;
+import javax.ejb.Stateless;
 
 import org.adempiere.util.ProcessUtil;
-import org.compiere.*;
-import org.compiere.acct.*;
+import org.compiere.Adempiere;
+import org.compiere.acct.Doc;
 import org.compiere.interfaces.Server;
 import org.compiere.interfaces.ServerLocal;
 import org.compiere.interfaces.ServerRemote;
-import org.compiere.model.*;
-import org.compiere.process.*;
-import org.compiere.util.*;
+import org.compiere.model.MAcctSchema;
+import org.compiere.model.MClient;
+import org.compiere.model.MTask;
+import org.compiere.model.MUser;
+import org.compiere.process.ProcessInfo;
+import org.compiere.util.CLogger;
+import org.compiere.util.CacheMgt;
+import org.compiere.util.EMail;
+import org.compiere.util.Env;
 
 /**
  * 	Adempiere Server Bean.
diff --git a/serverRoot/src/main/ejb/org/compiere/session/StatusBean.java b/serverRoot/src/main/ejb/org/compiere/session/StatusBean.java
index 39fe64d6e3..67a8ac6628 100644
--- a/serverRoot/src/main/ejb/org/compiere/session/StatusBean.java
+++ b/serverRoot/src/main/ejb/org/compiere/session/StatusBean.java
@@ -16,18 +16,21 @@
  *****************************************************************************/
 package org.compiere.session;
 
-import java.util.logging.*;
+import java.util.logging.Level;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.security.PermitAll;
-import javax.ejb.*;
+import javax.ejb.CreateException;
+import javax.ejb.Local;
+import javax.ejb.Remote;
+import javax.ejb.Stateless;
 
-import org.compiere.*;
-import org.compiere.db.*;
+import org.compiere.Adempiere;
+import org.compiere.db.CConnection;
 import org.compiere.interfaces.Status;
 import org.compiere.interfaces.StatusLocal;
 import org.compiere.interfaces.StatusRemote;
-import org.compiere.util.*;
+import org.compiere.util.CLogger;
 
 
 /**