diff --git a/base/src/org/compiere/impexp/BankStatementLoaderInterface.java b/base/src/org/compiere/impexp/BankStatementLoaderInterface.java
index 8afff1ac24..145deb7a6a 100644
--- a/base/src/org/compiere/impexp/BankStatementLoaderInterface.java
+++ b/base/src/org/compiere/impexp/BankStatementLoaderInterface.java
@@ -16,11 +16,11 @@
  *****************************************************************************/
 package org.compiere.impexp;
 
-import org.compiere.model.*;
-
 import java.math.BigDecimal;
 import java.sql.Timestamp;
 
+import org.compiere.model.MBankStatementLoader;
+
 
 /**
  *	Interface to be implemented by bank statement loader classes
diff --git a/base/src/org/compiere/impexp/BankStatementMatcherInterface.java b/base/src/org/compiere/impexp/BankStatementMatcherInterface.java
index a29b1884a5..8c2ea46605 100644
--- a/base/src/org/compiere/impexp/BankStatementMatcherInterface.java
+++ b/base/src/org/compiere/impexp/BankStatementMatcherInterface.java
@@ -16,7 +16,8 @@
  *****************************************************************************/
 package org.compiere.impexp;
 
-import org.compiere.model.*;
+import org.compiere.model.MBankStatementLine;
+import org.compiere.model.X_I_BankStatement;
 
 /**
  *	Bank Statement Matcher Algorithm Interface
diff --git a/base/src/org/compiere/impexp/CopyImportFormat.java b/base/src/org/compiere/impexp/CopyImportFormat.java
index 9559cc217a..69a422bc0a 100644
--- a/base/src/org/compiere/impexp/CopyImportFormat.java
+++ b/base/src/org/compiere/impexp/CopyImportFormat.java
@@ -16,9 +16,11 @@
  *****************************************************************************/
 package org.compiere.impexp;
 
-import java.math.*;
-import java.util.logging.*;
-import org.compiere.process.*;
+import java.math.BigDecimal;
+import java.util.logging.Level;
+
+import org.compiere.process.ProcessInfoParameter;
+import org.compiere.process.SvrProcess;
 
 
 /**
diff --git a/base/src/org/compiere/impexp/ImpFormat.java b/base/src/org/compiere/impexp/ImpFormat.java
index 5978269d86..530b892aee 100644
--- a/base/src/org/compiere/impexp/ImpFormat.java
+++ b/base/src/org/compiere/impexp/ImpFormat.java
@@ -16,11 +16,17 @@
  *****************************************************************************/
 package org.compiere.impexp;
 
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
-import org.compiere.model.*;
-import org.compiere.util.*;
+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.model.X_I_GLJournal;
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
 
 /**
  *	Import Format a Row
diff --git a/base/src/org/compiere/impexp/ImpFormatRow.java b/base/src/org/compiere/impexp/ImpFormatRow.java
index ab74441f6a..5ab6e2f021 100644
--- a/base/src/org/compiere/impexp/ImpFormatRow.java
+++ b/base/src/org/compiere/impexp/ImpFormatRow.java
@@ -17,12 +17,15 @@
  *****************************************************************************/
 package org.compiere.impexp;
 
-import java.math.*;
-import java.sql.*;
-import java.text.*;
-import java.util.logging.*;
-import org.compiere.model.*;
-import org.compiere.util.*;
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.logging.Level;
+
+import org.compiere.model.Callout;
+import org.compiere.util.CLogger;
 
 /**
  *	Import Format Row with pasing capability
diff --git a/base/src/org/compiere/impexp/MImpFormat.java b/base/src/org/compiere/impexp/MImpFormat.java
index 583acd73ba..a54b694f4c 100644
--- a/base/src/org/compiere/impexp/MImpFormat.java
+++ b/base/src/org/compiere/impexp/MImpFormat.java
@@ -16,11 +16,14 @@
  *****************************************************************************/
 package org.compiere.impexp;
 
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
-import org.compiere.model.*;
-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.model.X_AD_ImpFormat;
+import org.compiere.util.DB;
 
 
 /**
diff --git a/base/src/org/compiere/impexp/MImpFormatRow.java b/base/src/org/compiere/impexp/MImpFormatRow.java
index 216b406b51..7b814c0700 100644
--- a/base/src/org/compiere/impexp/MImpFormatRow.java
+++ b/base/src/org/compiere/impexp/MImpFormatRow.java
@@ -16,10 +16,10 @@
  *****************************************************************************/
 package org.compiere.impexp;
 
-import java.sql.*;
-import java.util.*;
+import java.sql.ResultSet;
+import java.util.Properties;
 
-import org.compiere.model.*;
+import org.compiere.model.X_AD_ImpFormat_Row;
 
 
 /**
diff --git a/base/src/org/compiere/impexp/OFX1ToXML.java b/base/src/org/compiere/impexp/OFX1ToXML.java
index f3a3f0940a..6dfecf22b5 100644
--- a/base/src/org/compiere/impexp/OFX1ToXML.java
+++ b/base/src/org/compiere/impexp/OFX1ToXML.java
@@ -16,9 +16,16 @@
  *****************************************************************************/
 package org.compiere.impexp;
 
-import java.io.*;
-import java.util.logging.*;
-import org.compiere.util.*;
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.PipedReader;
+import java.io.PipedWriter;
+import java.util.logging.Level;
+
+import org.compiere.util.CLogger;
 
 /**
  *	Covert OFX 1XX (SQGML) into valid XML
diff --git a/base/src/org/compiere/impexp/OFXBankStatementHandler.java b/base/src/org/compiere/impexp/OFXBankStatementHandler.java
index 2f48c3118f..26bd5e30b3 100644
--- a/base/src/org/compiere/impexp/OFXBankStatementHandler.java
+++ b/base/src/org/compiere/impexp/OFXBankStatementHandler.java
@@ -16,19 +16,25 @@
  *****************************************************************************/
 package org.compiere.impexp;
 
-import org.compiere.model.*;
-import org.compiere.util.Env;
-
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.math.BigDecimal;
-
 import java.sql.Timestamp;
-import java.text.SimpleDateFormat;
 import java.text.ParseException;
+import java.text.SimpleDateFormat;
 
-import javax.xml.parsers.*;
-import org.xml.sax.*;
-import org.xml.sax.helpers.*;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+
+import org.compiere.model.MBankStatementLoader;
+import org.compiere.util.Env;
+import org.xml.sax.Attributes;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.DefaultHandler;
 
 
 /**
diff --git a/base/src/org/compiere/impexp/OFXFileBankStatementLoader.java b/base/src/org/compiere/impexp/OFXFileBankStatementLoader.java
index a3d29c5b5e..630c438aeb 100644
--- a/base/src/org/compiere/impexp/OFXFileBankStatementLoader.java
+++ b/base/src/org/compiere/impexp/OFXFileBankStatementLoader.java
@@ -16,10 +16,9 @@
  *****************************************************************************/
 package org.compiere.impexp;
 
-import org.compiere.model.*;
-
-import java.io.*;
+import java.io.FileInputStream;
 
+import org.compiere.model.MBankStatementLoader;
 import org.xml.sax.SAXException;
 
 /**