diff --git a/base/src/org/adempiere/model/CalloutRMA.java b/base/src/org/adempiere/model/CalloutRMA.java
index 6dd4a3f3bc..3bd6e895d8 100644
--- a/base/src/org/adempiere/model/CalloutRMA.java
+++ b/base/src/org/adempiere/model/CalloutRMA.java
@@ -22,7 +22,6 @@ import java.util.Properties;
 import org.compiere.model.CalloutEngine;
 import org.compiere.model.GridField;
 import org.compiere.model.GridTab;
-import org.compiere.model.MRMA;
 import org.compiere.util.DB;
 
 /**
diff --git a/base/src/org/adempiere/model/GenericPO.java b/base/src/org/adempiere/model/GenericPO.java
index 1a25c9ed56..09065cc24b 100644
--- a/base/src/org/adempiere/model/GenericPO.java
+++ b/base/src/org/adempiere/model/GenericPO.java
@@ -21,9 +21,12 @@
 package org.adempiere.model;
 
 // import for GenericPO
-import java.util.*;
-import java.sql.*;
-import org.compiere.model.*;
+import java.sql.ResultSet;
+import java.util.Properties;
+
+import org.compiere.model.MTable;
+import org.compiere.model.PO;
+import org.compiere.model.POInfo;
 
 /**
  * Generic PO implementation, this can be use together with ModelValidator as alternative to the classic