diff --git a/base/src/org/compiere/model/MBOM.java b/base/src/org/compiere/model/MBOM.java
index 2df26de019..6a94eee41d 100644
--- a/base/src/org/compiere/model/MBOM.java
+++ b/base/src/org/compiere/model/MBOM.java
@@ -16,11 +16,16 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.ArrayList;
+import java.util.Properties;
+import java.util.logging.Level;
 
-import org.compiere.util.*;
+import org.compiere.util.CCache;
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.Msg;
 
 /**
  * 	BOM Model
diff --git a/base/src/org/compiere/model/MBOMProduct.java b/base/src/org/compiere/model/MBOMProduct.java
index c6302ed6d8..efa621c7fa 100644
--- a/base/src/org/compiere/model/MBOMProduct.java
+++ b/base/src/org/compiere/model/MBOMProduct.java
@@ -16,11 +16,16 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.ArrayList;
+import java.util.Properties;
+import java.util.logging.Level;
 
-import org.compiere.util.*;
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
+import org.compiere.util.Msg;
 
 /**
  * 	BOM Product/Component Model
diff --git a/base/src/org/compiere/model/MBPBankAccount.java b/base/src/org/compiere/model/MBPBankAccount.java
index b04304f060..1ca5c2d4e9 100644
--- a/base/src/org/compiere/model/MBPBankAccount.java
+++ b/base/src/org/compiere/model/MBPBankAccount.java
@@ -16,8 +16,10 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.ArrayList;
+import java.util.Properties;
 import java.util.logging.Level;
 
 import org.compiere.util.CLogger;
diff --git a/base/src/org/compiere/model/MBPGroup.java b/base/src/org/compiere/model/MBPGroup.java
index e61d749f88..58f23ed67c 100644
--- a/base/src/org/compiere/model/MBPGroup.java
+++ b/base/src/org/compiere/model/MBPGroup.java
@@ -16,12 +16,16 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.math.*;
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
+import java.math.BigDecimal;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.Properties;
+import java.util.logging.Level;
 
-import org.compiere.util.*;
+import org.compiere.util.CCache;
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
 
 /**
  *	Business Partner Group Model 
diff --git a/base/src/org/compiere/model/MBPartner.java b/base/src/org/compiere/model/MBPartner.java
index 13dd47f944..65892198a0 100644
--- a/base/src/org/compiere/model/MBPartner.java
+++ b/base/src/org/compiere/model/MBPartner.java
@@ -16,11 +16,18 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.math.*;
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
-import org.compiere.util.*;
+import java.math.BigDecimal;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Properties;
+import java.util.logging.Level;
+
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
+import org.compiere.util.Msg;
 
 /**
  *	Business Partner Model
diff --git a/base/src/org/compiere/model/MBPartnerInfo.java b/base/src/org/compiere/model/MBPartnerInfo.java
index 22af75058b..fc260323ec 100644
--- a/base/src/org/compiere/model/MBPartnerInfo.java
+++ b/base/src/org/compiere/model/MBPartnerInfo.java
@@ -16,10 +16,14 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
-import org.compiere.util.*;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.ArrayList;
+import java.util.Properties;
+import java.util.logging.Level;
+
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
 
 /**
  *	Business Partner Info Model for Query
diff --git a/base/src/org/compiere/model/MBPartnerLocation.java b/base/src/org/compiere/model/MBPartnerLocation.java
index b15be615d9..62a06b2081 100644
--- a/base/src/org/compiere/model/MBPartnerLocation.java
+++ b/base/src/org/compiere/model/MBPartnerLocation.java
@@ -16,10 +16,14 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
-import org.compiere.util.*;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.ArrayList;
+import java.util.Properties;
+import java.util.logging.Level;
+
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
 
 
 /**
diff --git a/base/src/org/compiere/model/MBPartnerProduct.java b/base/src/org/compiere/model/MBPartnerProduct.java
index 426b994524..701014781d 100644
--- a/base/src/org/compiere/model/MBPartnerProduct.java
+++ b/base/src/org/compiere/model/MBPartnerProduct.java
@@ -26,8 +26,6 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.util.Properties;
 
-import org.compiere.model.X_C_BPartner_Product;
-
 
 public class MBPartnerProduct extends X_C_BPartner_Product
 {
diff --git a/base/src/org/compiere/model/MBank.java b/base/src/org/compiere/model/MBank.java
index 504ec7056b..62df555641 100644
--- a/base/src/org/compiere/model/MBank.java
+++ b/base/src/org/compiere/model/MBank.java
@@ -16,10 +16,10 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
+import java.sql.ResultSet;
+import java.util.Properties;
 
-import org.compiere.util.*;
+import org.compiere.util.CCache;
 
 /**
  * 	Bank Model
diff --git a/base/src/org/compiere/model/MBankAccount.java b/base/src/org/compiere/model/MBankAccount.java
index 8caa684b2d..c5d9b7c0e6 100644
--- a/base/src/org/compiere/model/MBankAccount.java
+++ b/base/src/org/compiere/model/MBankAccount.java
@@ -16,9 +16,11 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
-import org.compiere.util.*;
+import java.sql.ResultSet;
+import java.util.Properties;
+
+import org.compiere.util.CCache;
+import org.compiere.util.Env;
 
 
 /**
diff --git a/base/src/org/compiere/model/MBankStatementLine.java b/base/src/org/compiere/model/MBankStatementLine.java
index c12ecf68de..afd259dbe9 100644
--- a/base/src/org/compiere/model/MBankStatementLine.java
+++ b/base/src/org/compiere/model/MBankStatementLine.java
@@ -17,10 +17,14 @@
  *****************************************************************************/
 package org.compiere.model;
  
-import java.math.*;
-import java.sql.*;
-import java.util.*;
-import org.compiere.util.*;
+import java.math.BigDecimal;
+import java.sql.ResultSet;
+import java.sql.Timestamp;
+import java.util.Properties;
+
+import org.compiere.util.DB;
+import org.compiere.util.Env;
+import org.compiere.util.Msg;
  
 /**
  *	Bank Statement Line Model
diff --git a/base/src/org/compiere/model/MBankStatementLoader.java b/base/src/org/compiere/model/MBankStatementLoader.java
index b4cbeb3c9f..7b8a480f40 100644
--- a/base/src/org/compiere/model/MBankStatementLoader.java
+++ b/base/src/org/compiere/model/MBankStatementLoader.java
@@ -16,9 +16,10 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
-import org.compiere.impexp.*;
+import java.sql.ResultSet;
+import java.util.Properties;
+
+import org.compiere.impexp.BankStatementLoaderInterface;
  
  
 /**
diff --git a/base/src/org/compiere/model/MBankStatementMatcher.java b/base/src/org/compiere/model/MBankStatementMatcher.java
index 8f1b99661f..53f5eea6f7 100644
--- a/base/src/org/compiere/model/MBankStatementMatcher.java
+++ b/base/src/org/compiere/model/MBankStatementMatcher.java
@@ -16,11 +16,16 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
-import org.compiere.impexp.*;
-import org.compiere.util.*;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.ArrayList;
+import java.util.Properties;
+import java.util.logging.Level;
+
+import org.compiere.impexp.BankStatementMatcherInterface;
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
 
 /**
  *	Bank Statement Matcher Algorithm
diff --git a/base/src/org/compiere/model/MBlackListCheque.java b/base/src/org/compiere/model/MBlackListCheque.java
index 012fd1d2ce..125042ea84 100644
--- a/base/src/org/compiere/model/MBlackListCheque.java
+++ b/base/src/org/compiere/model/MBlackListCheque.java
@@ -24,8 +24,6 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.util.Properties;
 
-import org.compiere.model.X_U_BlackListCheque;
-
 public class MBlackListCheque extends X_U_BlackListCheque
 {
 	/**