diff --git a/base/src/org/compiere/FA/BuildDepForecastFile.java b/base/src/org/compiere/FA/BuildDepForecastFile.java
index 3cf2c08340..c2111fb2f8 100644
--- a/base/src/org/compiere/FA/BuildDepForecastFile.java
+++ b/base/src/org/compiere/FA/BuildDepForecastFile.java
@@ -13,15 +13,22 @@
  *****************************************************************************/
 package org.compiere.FA;
 
-import java.sql.*;
+import java.math.BigDecimal;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.Timestamp;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
-import org.compiere.model.*;
-import org.compiere.util.DB;
-//import java.math.*;
-import java.math.BigDecimal;
 
-import org.compiere.process.*;
+import org.compiere.model.X_A_Depreciation;
+import org.compiere.model.X_A_Depreciation_Convention;
+import org.compiere.model.X_A_Depreciation_Exp;
+import org.compiere.model.X_A_Depreciation_Forecast;
+import org.compiere.model.X_A_Depreciation_Method;
+import org.compiere.model.X_A_Depreciation_Workfile;
+import org.compiere.process.ProcessInfoParameter;
+import org.compiere.process.SvrProcess;
+import org.compiere.util.DB;
 
 /**
  *	Build Depreciation Forecast File
diff --git a/base/src/org/compiere/FA/BuildDepWorkFile.java b/base/src/org/compiere/FA/BuildDepWorkFile.java
index 4b1de6599d..4cb045e28c 100644
--- a/base/src/org/compiere/FA/BuildDepWorkFile.java
+++ b/base/src/org/compiere/FA/BuildDepWorkFile.java
@@ -24,7 +24,6 @@ import org.compiere.model.X_A_Depreciation;
 import org.compiere.model.X_A_Depreciation_Build;
 import org.compiere.model.X_A_Depreciation_Convention;
 import org.compiere.model.X_A_Depreciation_Exp;
-import org.compiere.model.X_A_Depreciation_Forecast;
 import org.compiere.model.X_A_Depreciation_Method;
 import org.compiere.model.X_A_Depreciation_Workfile;
 import org.compiere.process.ProcessInfoParameter;
diff --git a/base/src/org/compiere/FA/CalloutFA.java b/base/src/org/compiere/FA/CalloutFA.java
index 5f8f4a8b0a..a06a070350 100644
--- a/base/src/org/compiere/FA/CalloutFA.java
+++ b/base/src/org/compiere/FA/CalloutFA.java
@@ -13,13 +13,16 @@
  *****************************************************************************/
 package org.compiere.FA;
 
-import java.sql.*;
-import java.util.*;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Properties;
 
-import org.compiere.util.*;
 import org.compiere.model.CalloutEngine;
 import org.compiere.model.GridField;
 import org.compiere.model.GridTab;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
 
 /**
  *	FA Callout.
diff --git a/base/src/org/compiere/FA/CreateInvoicedAsset.java b/base/src/org/compiere/FA/CreateInvoicedAsset.java
index 4830732f37..fc75c9dda4 100644
--- a/base/src/org/compiere/FA/CreateInvoicedAsset.java
+++ b/base/src/org/compiere/FA/CreateInvoicedAsset.java
@@ -13,21 +13,27 @@
  *****************************************************************************/
 package org.compiere.FA;
 
-import java.sql.*;
-//import java.util.Properties;
+import java.math.BigDecimal;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.util.logging.Level;
 
-import org.compiere.model.X_C_Invoice;
-import org.compiere.model.X_C_InvoiceLine;				
-import org.compiere.model.X_M_Product;
+import org.compiere.model.MAssetAcct;
+import org.compiere.model.MAssetChange;
+import org.compiere.model.MRefList;
+import org.compiere.model.X_A_Asset;
+import org.compiere.model.X_A_Asset_Addition;
+import org.compiere.model.X_A_Asset_Group_Acct;
+import org.compiere.model.X_A_Depreciation_Exp;
+import org.compiere.model.X_A_Depreciation_Workfile;
 import org.compiere.model.X_C_BPartner;
-import org.compiere.process.*;
+import org.compiere.model.X_C_Invoice;
+import org.compiere.model.X_C_InvoiceLine;
+import org.compiere.model.X_M_Product;
+import org.compiere.process.ProcessInfoParameter;
+import org.compiere.process.SvrProcess;
 import org.compiere.util.DB;
-//import org.compiere.util.Env;
-
-import java.math.BigDecimal;
-//import org.compiere.model.MCharge;
-import org.compiere.model.*;
 
 /**
  *	Create Asset from Invoice Process
diff --git a/base/src/org/compiere/FA/DepreciationAdj.java b/base/src/org/compiere/FA/DepreciationAdj.java
index 6b82b703d2..6c5a317bc8 100644
--- a/base/src/org/compiere/FA/DepreciationAdj.java
+++ b/base/src/org/compiere/FA/DepreciationAdj.java
@@ -13,10 +13,11 @@
  *****************************************************************************/
 package org.compiere.FA;
 
-import java.sql.*;
-import org.compiere.util.*;
-//import java.lang.Math;
 import java.math.BigDecimal;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+
+import org.compiere.util.DB;
 /**
  * Fixed Asset Depreciation
  * 
diff --git a/base/src/org/compiere/FA/ImportAsset.java b/base/src/org/compiere/FA/ImportAsset.java
index 270800296a..99e5fae307 100644
--- a/base/src/org/compiere/FA/ImportAsset.java
+++ b/base/src/org/compiere/FA/ImportAsset.java
@@ -13,12 +13,15 @@
  *****************************************************************************/
 package org.compiere.FA;
 
-import java.sql.*;
-import java.sql.Timestamp;
-//import java.sql.Date;
-import java.math.*;
-import org.compiere.process.*;
-import org.compiere.util.*;
+import java.math.BigDecimal;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Timestamp;
+
+import org.compiere.process.ProcessInfoParameter;
+import org.compiere.process.SvrProcess;
+import org.compiere.util.DB;
 
 /**
  *	Import Assets