diff --git a/base/src/org/compiere/model/MPInstance.java b/base/src/org/compiere/model/MPInstance.java
index b6223b7800..2275d93e31 100644
--- a/base/src/org/compiere/model/MPInstance.java
+++ b/base/src/org/compiere/model/MPInstance.java
@@ -16,11 +16,16 @@
  *****************************************************************************/
 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.DB;
+import org.compiere.util.Env;
 
 /**
  *  Process Instance Model
diff --git a/base/src/org/compiere/model/MPInstanceLog.java b/base/src/org/compiere/model/MPInstanceLog.java
index d00407a779..d5f5089870 100644
--- a/base/src/org/compiere/model/MPInstanceLog.java
+++ b/base/src/org/compiere/model/MPInstanceLog.java
@@ -16,8 +16,10 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.math.*;
+import java.math.BigDecimal;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Timestamp;
 
 import org.compiere.util.DB;
 
diff --git a/base/src/org/compiere/model/MPInstancePara.java b/base/src/org/compiere/model/MPInstancePara.java
index 578b2a6ec6..35d7df3263 100644
--- a/base/src/org/compiere/model/MPInstancePara.java
+++ b/base/src/org/compiere/model/MPInstancePara.java
@@ -16,9 +16,9 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.math.*;
-import java.sql.*;
-import java.util.*;
+import java.math.BigDecimal;
+import java.sql.ResultSet;
+import java.util.Properties;
 
 /**
  *  Process Instance Parameter Model
diff --git a/base/src/org/compiere/model/MPOS.java b/base/src/org/compiere/model/MPOS.java
index c644208ca3..e1f8c00840 100644
--- a/base/src/org/compiere/model/MPOS.java
+++ b/base/src/org/compiere/model/MPOS.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.Msg;
 
 
 /**
diff --git a/base/src/org/compiere/model/MPOSKey.java b/base/src/org/compiere/model/MPOSKey.java
index a2656b3e2c..c923fa59f8 100644
--- a/base/src/org/compiere/model/MPOSKey.java
+++ b/base/src/org/compiere/model/MPOSKey.java
@@ -16,8 +16,8 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
+import java.sql.ResultSet;
+import java.util.Properties;
 
 
 /**
diff --git a/base/src/org/compiere/model/MPOSKeyLayout.java b/base/src/org/compiere/model/MPOSKeyLayout.java
index 5a4a4434b0..47f1ade5a7 100644
--- a/base/src/org/compiere/model/MPOSKeyLayout.java
+++ b/base/src/org/compiere/model/MPOSKeyLayout.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.CCache;
+import org.compiere.util.DB;
 
 /**
  *	POS Function Key Layout
diff --git a/base/src/org/compiere/model/MPackage.java b/base/src/org/compiere/model/MPackage.java
index dc68f83da6..716147adba 100644
--- a/base/src/org/compiere/model/MPackage.java
+++ b/base/src/org/compiere/model/MPackage.java
@@ -16,8 +16,9 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
+import java.sql.ResultSet;
+import java.sql.Timestamp;
+import java.util.Properties;
 
 
 /**
diff --git a/base/src/org/compiere/model/MPackageExpDetail.java b/base/src/org/compiere/model/MPackageExpDetail.java
index 5278c74184..fd763296c2 100644
--- a/base/src/org/compiere/model/MPackageExpDetail.java
+++ b/base/src/org/compiere/model/MPackageExpDetail.java
@@ -17,10 +17,10 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
-import org.compiere.model.X_AD_Package_Exp_Detail;
-import org.compiere.util.*;
+import java.sql.ResultSet;
+import java.util.Properties;
+
+import org.compiere.util.DB;
 
 /**
  *	Menu Model
diff --git a/base/src/org/compiere/model/MPackageLine.java b/base/src/org/compiere/model/MPackageLine.java
index e62f4b1662..6b0e21651c 100644
--- a/base/src/org/compiere/model/MPackageLine.java
+++ b/base/src/org/compiere/model/MPackageLine.java
@@ -16,9 +16,10 @@
  *****************************************************************************/
 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.Env;
 
 /**
  *	Package Line Model
diff --git a/base/src/org/compiere/model/MPaySchedule.java b/base/src/org/compiere/model/MPaySchedule.java
index 748a3d027e..e8a3cd90bd 100644
--- a/base/src/org/compiere/model/MPaySchedule.java
+++ b/base/src/org/compiere/model/MPaySchedule.java
@@ -16,9 +16,10 @@
  *****************************************************************************/
 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.Env;
 
 /**
  *	Payment Term Schedule Model
diff --git a/base/src/org/compiere/model/MPaySelection.java b/base/src/org/compiere/model/MPaySelection.java
index 83de94ae08..496d53620f 100644
--- a/base/src/org/compiere/model/MPaySelection.java
+++ b/base/src/org/compiere/model/MPaySelection.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.DB;
+import org.compiere.util.Env;
 
 /**
  *	AP Payment Selection
diff --git a/base/src/org/compiere/model/MPaySelectionCheck.java b/base/src/org/compiere/model/MPaySelectionCheck.java
index 727c8f2486..95d085e0d5 100644
--- a/base/src/org/compiere/model/MPaySelectionCheck.java
+++ b/base/src/org/compiere/model/MPaySelectionCheck.java
@@ -16,13 +16,21 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.io.*;
-import java.math.*;
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
-import org.compiere.process.*;
-import org.compiere.util.*;
+import java.io.File;
+import java.io.FileWriter;
+import java.math.BigDecimal;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Properties;
+import java.util.logging.Level;
+
+import org.compiere.process.DocAction;
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
+import org.compiere.util.Msg;
 
 /**
  *  Payment Print/Export model.
diff --git a/base/src/org/compiere/model/MPaySelectionLine.java b/base/src/org/compiere/model/MPaySelectionLine.java
index 22f6d82da8..72698847fd 100644
--- a/base/src/org/compiere/model/MPaySelectionLine.java
+++ b/base/src/org/compiere/model/MPaySelectionLine.java
@@ -16,10 +16,12 @@
  *****************************************************************************/
 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.util.Properties;
+
+import org.compiere.util.DB;
+import org.compiere.util.Env;
 
 /**
  *	Payment Selection Line Model
diff --git a/base/src/org/compiere/model/MPayment.java b/base/src/org/compiere/model/MPayment.java
index d73354eb3b..b18d74658a 100644
--- a/base/src/org/compiere/model/MPayment.java
+++ b/base/src/org/compiere/model/MPayment.java
@@ -18,7 +18,6 @@ package org.compiere.model;
 
 import java.io.File;
 import java.math.BigDecimal;
-import java.rmi.RemoteException;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -28,13 +27,10 @@ import java.util.HashMap;
 import java.util.Properties;
 import java.util.logging.Level;
 
-import org.compiere.db.CConnection;
-import org.compiere.interfaces.Server;
 import org.compiere.process.DocAction;
 import org.compiere.process.DocumentEngine;
 import org.compiere.process.ProcessCall;
 import org.compiere.process.ProcessInfo;
-import org.compiere.util.CLogMgt;
 import org.compiere.util.CLogger;
 import org.compiere.util.DB;
 import org.compiere.util.Env;
diff --git a/base/src/org/compiere/model/MPaymentProcessor.java b/base/src/org/compiere/model/MPaymentProcessor.java
index 691868d082..2326647e52 100644
--- a/base/src/org/compiere/model/MPaymentProcessor.java
+++ b/base/src/org/compiere/model/MPaymentProcessor.java
@@ -16,11 +16,17 @@
  *****************************************************************************/
 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.SQLException;
+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;
 
 
 /**
diff --git a/base/src/org/compiere/model/MPaymentTerm.java b/base/src/org/compiere/model/MPaymentTerm.java
index 406616fee1..13dd10dc31 100644
--- a/base/src/org/compiere/model/MPaymentTerm.java
+++ b/base/src/org/compiere/model/MPaymentTerm.java
@@ -16,11 +16,16 @@
  *****************************************************************************/
 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.util.ArrayList;
+import java.util.Properties;
+import java.util.logging.Level;
+
+import org.compiere.util.DB;
+import org.compiere.util.Env;
+import org.compiere.util.Msg;
 
 
 /**
diff --git a/base/src/org/compiere/model/MPaymentValidate.java b/base/src/org/compiere/model/MPaymentValidate.java
index 86e40998a6..67df5df957 100644
--- a/base/src/org/compiere/model/MPaymentValidate.java
+++ b/base/src/org/compiere/model/MPaymentValidate.java
@@ -16,8 +16,10 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.util.*;
-import org.compiere.util.*;
+import java.util.Calendar;
+import java.util.StringTokenizer;
+
+import org.compiere.util.CLogger;
 
 
 /**
diff --git a/base/src/org/compiere/model/MPeriodControl.java b/base/src/org/compiere/model/MPeriodControl.java
index 27436d22ab..c812a2dea0 100644
--- a/base/src/org/compiere/model/MPeriodControl.java
+++ b/base/src/org/compiere/model/MPeriodControl.java
@@ -16,8 +16,8 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
+import java.sql.ResultSet;
+import java.util.Properties;
 
 /**
  *	Period Control Model