diff --git a/base/src/org/adempiere/process/ASPGenerateFields.java b/base/src/org/adempiere/process/ASPGenerateFields.java
index 89b1e873c9..941547c97d 100644
--- a/base/src/org/adempiere/process/ASPGenerateFields.java
+++ b/base/src/org/adempiere/process/ASPGenerateFields.java
@@ -29,14 +29,14 @@
 
 package org.adempiere.process;
 
-import java.util.*;
-import java.util.logging.*;
-import org.compiere.model.*;
+import java.util.logging.Level;
+
+import org.compiere.model.MField;
+import org.compiere.model.MTab;
+import org.compiere.model.X_ASP_Field;
 import org.compiere.process.ProcessInfoParameter;
 import org.compiere.process.SvrProcess;
 import org.compiere.util.DB;
-import org.compiere.wf.MWFNode;
-import org.compiere.wf.MWorkflow;
 
 /**
  * 	Generate ASP fields for a window
diff --git a/base/src/org/adempiere/process/ASPGenerateLevel.java b/base/src/org/adempiere/process/ASPGenerateLevel.java
index 2bb136a595..936777d199 100644
--- a/base/src/org/adempiere/process/ASPGenerateLevel.java
+++ b/base/src/org/adempiere/process/ASPGenerateLevel.java
@@ -29,13 +29,31 @@
 
 package org.adempiere.process;
 
-import java.util.*;
-import java.util.logging.*;
-import org.compiere.model.*;
+import java.util.Enumeration;
+import java.util.logging.Level;
+
+import org.compiere.model.MClientInfo;
+import org.compiere.model.MField;
+import org.compiere.model.MForm;
+import org.compiere.model.MMenu;
+import org.compiere.model.MProcess;
+import org.compiere.model.MProcessPara;
+import org.compiere.model.MTab;
+import org.compiere.model.MTask;
+import org.compiere.model.MTree;
+import org.compiere.model.MTreeNode;
+import org.compiere.model.MWindow;
+import org.compiere.model.X_ASP_Field;
+import org.compiere.model.X_ASP_Form;
+import org.compiere.model.X_ASP_Process;
+import org.compiere.model.X_ASP_Process_Para;
+import org.compiere.model.X_ASP_Tab;
+import org.compiere.model.X_ASP_Task;
+import org.compiere.model.X_ASP_Window;
+import org.compiere.model.X_ASP_Workflow;
 import org.compiere.process.ProcessInfoParameter;
 import org.compiere.process.SvrProcess;
 import org.compiere.util.DB;
-import org.compiere.wf.MWFNode;
 import org.compiere.wf.MWorkflow;
 
 /**
diff --git a/base/src/org/adempiere/process/ApplyMigrationScripts.java b/base/src/org/adempiere/process/ApplyMigrationScripts.java
index 7c5949d06f..b042fb4a61 100644
--- a/base/src/org/adempiere/process/ApplyMigrationScripts.java
+++ b/base/src/org/adempiere/process/ApplyMigrationScripts.java
@@ -29,8 +29,6 @@
 package org.adempiere.process;
 
 import java.io.BufferedReader;
-import java.io.File;
-import java.io.FilenameFilter;
 import java.io.IOException;
 import java.io.StringReader;
 import java.sql.Connection;
@@ -38,18 +36,10 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
-import java.util.Vector;
-import java.util.logging.Level;
 
-import org.compiere.Adempiere;
-import org.compiere.model.MIssue;
-import org.compiere.model.X_AD_Error;
 import org.compiere.process.SvrProcess;
-import org.compiere.util.CLogErrorBuffer;
-import org.compiere.util.CLogMgt;
 import org.compiere.util.CLogger;
 import org.compiere.util.DB;
-import org.compiere.util.Env;
 
 public class ApplyMigrationScripts extends SvrProcess {
 
diff --git a/base/src/org/adempiere/process/HouseKeeping.java b/base/src/org/adempiere/process/HouseKeeping.java
index b3f78284e5..626cd84270 100644
--- a/base/src/org/adempiere/process/HouseKeeping.java
+++ b/base/src/org/adempiere/process/HouseKeeping.java
@@ -37,6 +37,7 @@ import java.sql.Timestamp;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.logging.Level;
+
 import org.adempiere.model.GenericPO;
 import org.compiere.model.MTable;
 import org.compiere.model.X_AD_HouseKeeping;
diff --git a/base/src/org/adempiere/process/PrepareMigrationScripts.java b/base/src/org/adempiere/process/PrepareMigrationScripts.java
index 67efdc6161..8c1c1d7651 100644
--- a/base/src/org/adempiere/process/PrepareMigrationScripts.java
+++ b/base/src/org/adempiere/process/PrepareMigrationScripts.java
@@ -30,11 +30,7 @@
 package org.adempiere.process;
 
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.FilenameFilter;
-import java.io.IOException;
-import java.io.InputStream;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
@@ -44,7 +40,6 @@ import java.util.Vector;
 import java.util.logging.Level;
 
 import org.compiere.Adempiere;
-import org.compiere.model.MSequence;
 import org.compiere.process.ProcessInfoParameter;
 import org.compiere.process.SvrProcess;
 import org.compiere.util.DB;