diff --git a/base/src/org/compiere/model/MAccessLog.java b/base/src/org/compiere/model/MAccessLog.java
index 8142e358fe..e389d466e0 100644
--- a/base/src/org/compiere/model/MAccessLog.java
+++ b/base/src/org/compiere/model/MAccessLog.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/MAccessProfile.java b/base/src/org/compiere/model/MAccessProfile.java
index 98551a636e..f9ae5af7a4 100644
--- a/base/src/org/compiere/model/MAccessProfile.java
+++ b/base/src/org/compiere/model/MAccessProfile.java
@@ -16,8 +16,8 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
+import java.sql.ResultSet;
+import java.util.Properties;
 
 /**
  * 	Media Access Profile
diff --git a/base/src/org/compiere/model/MAchievement.java b/base/src/org/compiere/model/MAchievement.java
index 41fe1a2c52..aecea31d1e 100644
--- a/base/src/org/compiere/model/MAchievement.java
+++ b/base/src/org/compiere/model/MAchievement.java
@@ -16,11 +16,13 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
+import java.sql.ResultSet;
+import java.sql.Timestamp;
+import java.util.List;
+import java.util.Properties;
 
-import org.compiere.util.*;
+import org.compiere.util.CLogger;
+import org.compiere.util.Env;
 
 /**
  * 	Performance Achievement
diff --git a/base/src/org/compiere/model/MActivity.java b/base/src/org/compiere/model/MActivity.java
index 82f4907915..788a802f07 100644
--- a/base/src/org/compiere/model/MActivity.java
+++ b/base/src/org/compiere/model/MActivity.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/MAd.java b/base/src/org/compiere/model/MAd.java
index a3aadbd1c4..c10fc88e8c 100644
--- a/base/src/org/compiere/model/MAd.java
+++ b/base/src/org/compiere/model/MAd.java
@@ -16,8 +16,9 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.util.*;
-import javax.servlet.http.*;
+import java.util.Properties;
+
+import javax.servlet.http.HttpServletRequest;
 
 /**
  * Container Model
diff --git a/base/src/org/compiere/model/MAdvertisement.java b/base/src/org/compiere/model/MAdvertisement.java
index 5582f51b24..9f46159bf8 100644
--- a/base/src/org/compiere/model/MAdvertisement.java
+++ b/base/src/org/compiere/model/MAdvertisement.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.DB;
+import org.compiere.util.ValueNamePair;
 
 /**
  *	Advertisement Model
diff --git a/base/src/org/compiere/model/MAging.java b/base/src/org/compiere/model/MAging.java
index b8faf4770c..45579528e8 100644
--- a/base/src/org/compiere/model/MAging.java
+++ b/base/src/org/compiere/model/MAging.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.sql.Timestamp;
+import java.util.Properties;
+
+import org.compiere.util.Env;
 
 /**
  *	Aging Model
diff --git a/base/src/org/compiere/model/M_Registration.java b/base/src/org/compiere/model/M_Registration.java
index e69ed49784..f3fb5bdf45 100644
--- a/base/src/org/compiere/model/M_Registration.java
+++ b/base/src/org/compiere/model/M_Registration.java
@@ -16,8 +16,8 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
+import java.sql.ResultSet;
+import java.util.Properties;
 
 
 /**