diff --git a/JasperReports/src/org/compiere/report/JasperReportViewer.java b/JasperReports/src/org/compiere/report/JasperReportViewer.java
index 2930e53ab9..656b5a2ed5 100644
--- a/JasperReports/src/org/compiere/report/JasperReportViewer.java
+++ b/JasperReports/src/org/compiere/report/JasperReportViewer.java
@@ -3,7 +3,6 @@
  */
 package org.compiere.report;
 
-import java.awt.Component;
 import java.util.logging.Level;
 import net.sf.jasperreports.view.JRViewer;
 import net.sf.jasperreports.engine.JasperPrint;
diff --git a/JasperReports/src/org/compiere/report/ReportStarter.java b/JasperReports/src/org/compiere/report/ReportStarter.java
index df1530154c..44839f8f87 100644
--- a/JasperReports/src/org/compiere/report/ReportStarter.java
+++ b/JasperReports/src/org/compiere/report/ReportStarter.java
@@ -35,7 +35,6 @@ import javax.naming.NamingException;
 
 import net.sf.jasperreports.engine.JRException;
 import net.sf.jasperreports.engine.JasperCompileManager;
-import net.sf.jasperreports.engine.JasperExportManager;
 import net.sf.jasperreports.engine.JasperFillManager;
 import net.sf.jasperreports.engine.JasperPrint;
 import net.sf.jasperreports.engine.JasperPrintManager;
diff --git a/base/src/org/adempiere/pipo/GenericPO.java b/base/src/org/adempiere/pipo/GenericPO.java
index c331d0e263..1b8dc7bf33 100644
--- a/base/src/org/adempiere/pipo/GenericPO.java
+++ b/base/src/org/adempiere/pipo/GenericPO.java
@@ -23,8 +23,6 @@ package org.adempiere.pipo;
 // import for GenericPO
 import java.util.*;
 import java.sql.*;
-import java.math.*;
-import org.compiere.util.*;
 import org.compiere.model.*;
 
 public class GenericPO extends PO {
diff --git a/base/src/org/adempiere/pipo/PackIn.java b/base/src/org/adempiere/pipo/PackIn.java
index ab38f2e455..81dd889b58 100644
--- a/base/src/org/adempiere/pipo/PackIn.java
+++ b/base/src/org/adempiere/pipo/PackIn.java
@@ -29,7 +29,6 @@ import org.compiere.util.CLogMgt;
 import org.compiere.util.DB;
 import org.compiere.util.Env;
 import org.compiere.util.Ini;
-import org.compiere.util.Util;
 
 import java.util.Properties;
 import java.util.logging.*;
diff --git a/base/src/org/adempiere/pipo/PackInHandler.java b/base/src/org/adempiere/pipo/PackInHandler.java
index fc061f41c9..84aa8e20f2 100644
--- a/base/src/org/adempiere/pipo/PackInHandler.java
+++ b/base/src/org/adempiere/pipo/PackInHandler.java
@@ -25,7 +25,6 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
-import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -47,11 +46,9 @@ import org.xml.sax.SAXException;
 import org.xml.sax.helpers.AttributesImpl;
 import org.compiere.Adempiere;
 import org.compiere.model.*;
-import org.compiere.util.AdempiereUserError;
 import org.compiere.util.DB;
 import org.compiere.util.Env;
 import org.compiere.util.CLogger;
-import org.compiere.util.ValueNamePair;
 import org.xml.sax.Attributes;
 
 import org.xml.sax.helpers.DefaultHandler;
diff --git a/base/src/org/compiere/cm/CalloutTemplate.java b/base/src/org/compiere/cm/CalloutTemplate.java
index 71670bf5a8..b467635e03 100644
--- a/base/src/org/compiere/cm/CalloutTemplate.java
+++ b/base/src/org/compiere/cm/CalloutTemplate.java
@@ -16,11 +16,7 @@
  *****************************************************************************/
 package org.compiere.cm;
 
-import java.math.*;
-import java.sql.*;
 import java.util.*;
-import java.util.logging.*;
-import org.compiere.util.*;
 import org.compiere.model.*;
 
 /**
diff --git a/base/src/org/compiere/model/CalloutInOut.java b/base/src/org/compiere/model/CalloutInOut.java
index 0cd5c5da44..792acd0638 100644
--- a/base/src/org/compiere/model/CalloutInOut.java
+++ b/base/src/org/compiere/model/CalloutInOut.java
@@ -21,7 +21,6 @@ import java.sql.*;
 import java.util.*;
 import java.util.logging.*;
 import org.compiere.util.*;
-import com.sun.org.apache.bcel.internal.generic.*;
 
 
 /**
diff --git a/base/src/org/compiere/model/GridTab.java b/base/src/org/compiere/model/GridTab.java
index 18dcdea0c8..dae442713f 100644
--- a/base/src/org/compiere/model/GridTab.java
+++ b/base/src/org/compiere/model/GridTab.java
@@ -18,7 +18,6 @@ package org.compiere.model;
 
 import java.beans.*;
 import java.io.*;
-import java.math.BigDecimal;
 import java.sql.*;
 import java.text.*;
 import java.util.*;
diff --git a/base/src/org/compiere/model/GridWindow.java b/base/src/org/compiere/model/GridWindow.java
index 638a3097b7..38baa2c000 100644
--- a/base/src/org/compiere/model/GridWindow.java
+++ b/base/src/org/compiere/model/GridWindow.java
@@ -18,13 +18,11 @@ package org.compiere.model;
 
 import java.awt.*;
 import java.io.*;
-import java.rmi.*;
 import java.sql.*;
 import java.util.*;
 import java.util.logging.*;
 import javax.swing.*;
 import org.apache.ecs.xhtml.*;
-import org.compiere.db.*;
 import org.compiere.plaf.*;
 import org.compiere.util.*;
 
diff --git a/base/src/org/compiere/model/MCStageElement.java b/base/src/org/compiere/model/MCStageElement.java
index 7a56336eb5..7e6e9010dd 100644
--- a/base/src/org/compiere/model/MCStageElement.java
+++ b/base/src/org/compiere/model/MCStageElement.java
@@ -18,8 +18,6 @@ package org.compiere.model;
 
 import java.sql.*;
 import java.util.*;
-import java.util.logging.*;
-import org.compiere.util.*;
 
 /**
  * CStage Element
diff --git a/base/src/org/compiere/model/MMediaServer.java b/base/src/org/compiere/model/MMediaServer.java
index 52a17464a6..15b39ad781 100644
--- a/base/src/org/compiere/model/MMediaServer.java
+++ b/base/src/org/compiere/model/MMediaServer.java
@@ -18,13 +18,11 @@ package org.compiere.model;
 
 import java.io.*;
 import java.sql.*;
-import java.text.*;
 import java.util.*;
 import java.util.logging.*;
 
 import org.apache.commons.net.ftp.*;
 import org.compiere.util.*;
-import com.sun.org.apache.bcel.internal.generic.*;
 
 /**
  * 	Media Server Model
diff --git a/base/src/org/compiere/process/CopyColumnsFromTable.java b/base/src/org/compiere/process/CopyColumnsFromTable.java
index 923604c878..adca55dbac 100644
--- a/base/src/org/compiere/process/CopyColumnsFromTable.java
+++ b/base/src/org/compiere/process/CopyColumnsFromTable.java
@@ -15,9 +15,7 @@
  *****************************************************************************/
 package org.compiere.process;
 
-import java.sql.*;
 import java.util.logging.*;
-import org.compiere.db.*;
 import org.compiere.model.*;
 import org.compiere.util.*;
 
diff --git a/base/src/org/compiere/process/CopyRole.java b/base/src/org/compiere/process/CopyRole.java
index a0966111c2..94eb9f41e8 100755
--- a/base/src/org/compiere/process/CopyRole.java
+++ b/base/src/org/compiere/process/CopyRole.java
@@ -24,7 +24,6 @@ import java.sql.ResultSet;
 import java.util.logging.Level;
 import org.compiere.util.DB;
 import org.compiere.util.Env;
-import org.compiere.process.*;
 
 
 /**
diff --git a/base/src/org/compiere/process/KIndexRerun.java b/base/src/org/compiere/process/KIndexRerun.java
index d42266c8ed..59866faf42 100644
--- a/base/src/org/compiere/process/KIndexRerun.java
+++ b/base/src/org/compiere/process/KIndexRerun.java
@@ -17,7 +17,6 @@
 package org.compiere.process;
 
 import java.math.*;
-import java.sql.*;
 import java.util.logging.*;
 
 import org.compiere.model.*;
diff --git a/base/src/org/compiere/process/SynchronizeTerminology.java b/base/src/org/compiere/process/SynchronizeTerminology.java
index fb8e599ca3..3c807d7337 100644
--- a/base/src/org/compiere/process/SynchronizeTerminology.java
+++ b/base/src/org/compiere/process/SynchronizeTerminology.java
@@ -14,7 +14,6 @@
 package org.compiere.process;
 
 import java.sql.*;
-import java.math.*;
 import java.util.logging.*;
 
 import org.compiere.model.*;
diff --git a/base/src/org/compiere/report/core/ResultTableCellRenderer.java b/base/src/org/compiere/report/core/ResultTableCellRenderer.java
index f1b217fa62..cd87f825ad 100644
--- a/base/src/org/compiere/report/core/ResultTableCellRenderer.java
+++ b/base/src/org/compiere/report/core/ResultTableCellRenderer.java
@@ -22,7 +22,6 @@ import javax.swing.*;
 import javax.swing.table.*;
 
 import org.adempiere.plaf.AdempierePLAF;
-import org.compiere.plaf.*;
 import org.compiere.util.*;
 
 /**
diff --git a/client/src/org/compiere/apps/AGlassPane.java b/client/src/org/compiere/apps/AGlassPane.java
index a0fc28a14b..00601b2a74 100644
--- a/client/src/org/compiere/apps/AGlassPane.java
+++ b/client/src/org/compiere/apps/AGlassPane.java
@@ -22,7 +22,6 @@ import javax.swing.*;
 
 import org.adempiere.plaf.AdempierePLAF;
 import org.compiere.db.*;
-import org.compiere.plaf.*;
 import java.util.logging.*;
 import org.compiere.util.*;
 
diff --git a/client/src/org/compiere/apps/ALogin.java b/client/src/org/compiere/apps/ALogin.java
index c6cac03cbc..d7b4ccbe14 100644
--- a/client/src/org/compiere/apps/ALogin.java
+++ b/client/src/org/compiere/apps/ALogin.java
@@ -28,7 +28,6 @@ import org.compiere.*;
 import org.compiere.db.*;
 import org.compiere.grid.ed.*;
 import org.compiere.model.*;
-import org.compiere.plaf.*;
 import org.compiere.print.*;
 import org.compiere.swing.*;
 import org.compiere.util.*;
diff --git a/client/src/org/compiere/apps/ALoginTest.java b/client/src/org/compiere/apps/ALoginTest.java
index 52cc566347..756f44a334 100644
--- a/client/src/org/compiere/apps/ALoginTest.java
+++ b/client/src/org/compiere/apps/ALoginTest.java
@@ -24,7 +24,6 @@ import java.sql.*;
 import javax.swing.*;
 
 import org.adempiere.plaf.AdempierePLAF;
-import org.compiere.plaf.*;
 import org.compiere.swing.*;
 
 /**
diff --git a/client/src/org/compiere/apps/AMenuStartItem.java b/client/src/org/compiere/apps/AMenuStartItem.java
index bf5123fc75..7b9cb4e1b4 100644
--- a/client/src/org/compiere/apps/AMenuStartItem.java
+++ b/client/src/org/compiere/apps/AMenuStartItem.java
@@ -16,7 +16,6 @@
  *****************************************************************************/
 package org.compiere.apps;
 
-import java.awt.Frame;
 import java.awt.event.*;
 import java.sql.*;
 import java.util.logging.*;
diff --git a/client/src/org/compiere/apps/ATask.java b/client/src/org/compiere/apps/ATask.java
index bd8859dadc..7531cecd22 100644
--- a/client/src/org/compiere/apps/ATask.java
+++ b/client/src/org/compiere/apps/ATask.java
@@ -23,7 +23,6 @@ import javax.swing.*;
 
 import org.adempiere.plaf.AdempierePLAF;
 import org.compiere.*;
-import org.compiere.plaf.*;
 import org.compiere.util.*;
 import org.compiere.model.*;
 import org.compiere.swing.*;
diff --git a/client/src/org/compiere/apps/Attachment.java b/client/src/org/compiere/apps/Attachment.java
index 69267c0f1c..3086449a9a 100644
--- a/client/src/org/compiere/apps/Attachment.java
+++ b/client/src/org/compiere/apps/Attachment.java
@@ -24,7 +24,6 @@ import javax.swing.*;
 
 import org.adempiere.plaf.AdempierePLAF;
 import org.compiere.model.*;
-import org.compiere.plaf.*;
 import org.compiere.swing.*;
 import org.compiere.util.*;
 
diff --git a/client/src/org/compiere/apps/Help.java b/client/src/org/compiere/apps/Help.java
index b08d1dabbf..635b33d01c 100644
--- a/client/src/org/compiere/apps/Help.java
+++ b/client/src/org/compiere/apps/Help.java
@@ -24,7 +24,6 @@ import java.util.logging.*;
 
 import org.adempiere.plaf.AdempierePLAF;
 import org.compiere.model.*;
-import org.compiere.plaf.*;
 import org.compiere.swing.*;
 import org.compiere.util.*;
 
diff --git a/client/src/org/compiere/apps/OnlineHelp.java b/client/src/org/compiere/apps/OnlineHelp.java
index fce702b0fc..43a509fc1e 100644
--- a/client/src/org/compiere/apps/OnlineHelp.java
+++ b/client/src/org/compiere/apps/OnlineHelp.java
@@ -27,7 +27,6 @@ import javax.swing.text.*;
 import javax.swing.text.html.*;
 
 import org.adempiere.plaf.AdempierePLAF;
-import org.compiere.plaf.*;
 import org.compiere.util.Env;
 
 /**
diff --git a/client/src/org/compiere/apps/Preference.java b/client/src/org/compiere/apps/Preference.java
index 2b748e724c..ca61bf8135 100644
--- a/client/src/org/compiere/apps/Preference.java
+++ b/client/src/org/compiere/apps/Preference.java
@@ -28,15 +28,12 @@ import javax.swing.event.*;
 import javax.swing.plaf.metal.MetalLookAndFeel;
 import javax.swing.plaf.metal.MetalTheme;
 import javax.swing.table.*;
-//
-import org.adempiere.plaf.PLAFEditor;
 import org.adempiere.plaf.PLAFEditorPanel;
 import org.adempiere.plaf.AdempierePLAF;
 import org.compiere.db.*;
 import org.compiere.grid.ed.*;
 import org.compiere.minigrid.*;
 import org.compiere.model.*;
-import org.compiere.plaf.*;
 import org.compiere.print.*;
 import org.compiere.swing.*;
 import org.compiere.util.*;
diff --git a/client/src/org/compiere/apps/ProcessDialog.java b/client/src/org/compiere/apps/ProcessDialog.java
index 3fcbc1dd1f..e0d49e0168 100644
--- a/client/src/org/compiere/apps/ProcessDialog.java
+++ b/client/src/org/compiere/apps/ProcessDialog.java
@@ -22,8 +22,6 @@ import java.sql.*;
 import java.util.logging.*;
 import javax.swing.*;
 
-import org.adempiere.plaf.AdempierePLAF;
-import org.compiere.plaf.*;
 import org.compiere.print.*;
 import org.compiere.process.*;
 import org.compiere.swing.*;
diff --git a/client/src/org/compiere/apps/StatusBar.java b/client/src/org/compiere/apps/StatusBar.java
index f47b5b5aca..2107e4acf2 100644
--- a/client/src/org/compiere/apps/StatusBar.java
+++ b/client/src/org/compiere/apps/StatusBar.java
@@ -22,7 +22,6 @@ import javax.swing.*;
 
 import org.adempiere.plaf.AdempierePLAF;
 import org.compiere.model.*;
-import org.compiere.plaf.*;
 import org.compiere.swing.*;
 import org.compiere.util.*;
 
diff --git a/client/src/org/compiere/apps/graph/PerformanceIndicator.java b/client/src/org/compiere/apps/graph/PerformanceIndicator.java
index a22e840591..c0d74f01cc 100644
--- a/client/src/org/compiere/apps/graph/PerformanceIndicator.java
+++ b/client/src/org/compiere/apps/graph/PerformanceIndicator.java
@@ -18,7 +18,6 @@ package org.compiere.apps.graph;
 
 import java.awt.*;
 import java.awt.event.*;
-import java.awt.font.*;
 import java.text.*;
 import javax.swing.*;
 import javax.swing.border.*;
@@ -29,10 +28,6 @@ import java.awt.Color;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.Font;
-import java.awt.GradientPaint;
-import java.awt.Graphics2D;
-import java.awt.geom.Rectangle2D;
-import java.awt.image.BufferedImage;
 //import java.awt.R`;
 import org.jfree.chart.ChartPanel;
 import org.jfree.chart.JFreeChart;
diff --git a/client/src/org/compiere/apps/search/FindValueRenderer.java b/client/src/org/compiere/apps/search/FindValueRenderer.java
index e9b638e323..487313b2d9 100644
--- a/client/src/org/compiere/apps/search/FindValueRenderer.java
+++ b/client/src/org/compiere/apps/search/FindValueRenderer.java
@@ -23,7 +23,6 @@ import javax.swing.table.*;
 
 import org.adempiere.plaf.AdempierePLAF;
 import org.compiere.model.*;
-import org.compiere.plaf.*;
 import java.util.logging.*;
 import org.compiere.util.*;
 
diff --git a/client/src/org/compiere/apps/search/InfoAsset.java b/client/src/org/compiere/apps/search/InfoAsset.java
index 10e9464c4f..523372d139 100644
--- a/client/src/org/compiere/apps/search/InfoAsset.java
+++ b/client/src/org/compiere/apps/search/InfoAsset.java
@@ -24,7 +24,6 @@ import org.compiere.apps.*;
 import org.compiere.grid.ed.*;
 import org.compiere.minigrid.*;
 import org.compiere.model.*;
-import org.compiere.plaf.*;
 import org.compiere.swing.*;
 import org.compiere.util.*;
 
diff --git a/client/src/org/compiere/apps/search/InfoBPartner.java b/client/src/org/compiere/apps/search/InfoBPartner.java
index 645cf2c381..e1ba7dbbb2 100644
--- a/client/src/org/compiere/apps/search/InfoBPartner.java
+++ b/client/src/org/compiere/apps/search/InfoBPartner.java
@@ -26,7 +26,6 @@ import org.compiere.apps.*;
 import org.compiere.grid.ed.*;
 import org.compiere.minigrid.*;
 import org.compiere.model.*;
-import org.compiere.plaf.*;
 import org.compiere.swing.*;
 import org.compiere.util.*;
 
diff --git a/client/src/org/compiere/apps/search/InfoCashLine.java b/client/src/org/compiere/apps/search/InfoCashLine.java
index b866a2b33e..bbd8af53c3 100644
--- a/client/src/org/compiere/apps/search/InfoCashLine.java
+++ b/client/src/org/compiere/apps/search/InfoCashLine.java
@@ -26,7 +26,6 @@ import org.compiere.apps.*;
 import org.compiere.grid.ed.*;
 import org.compiere.minigrid.*;
 import org.compiere.model.*;
-import org.compiere.plaf.*;
 import org.compiere.swing.*;
 import org.compiere.util.*;
 
diff --git a/client/src/org/compiere/apps/search/InfoGeneral.java b/client/src/org/compiere/apps/search/InfoGeneral.java
index d04bff5ef8..85de76a25a 100644
--- a/client/src/org/compiere/apps/search/InfoGeneral.java
+++ b/client/src/org/compiere/apps/search/InfoGeneral.java
@@ -26,7 +26,6 @@ import javax.swing.*;
 import org.adempiere.plaf.AdempierePLAF;
 import org.compiere.apps.*;
 import org.compiere.minigrid.*;
-import org.compiere.plaf.*;
 import org.compiere.swing.*;
 import org.compiere.util.*;
 
diff --git a/client/src/org/compiere/apps/search/InfoInOut.java b/client/src/org/compiere/apps/search/InfoInOut.java
index 44b8c3bb60..44208bf286 100644
--- a/client/src/org/compiere/apps/search/InfoInOut.java
+++ b/client/src/org/compiere/apps/search/InfoInOut.java
@@ -25,7 +25,6 @@ import org.compiere.apps.*;
 import org.compiere.grid.ed.*;
 import org.compiere.minigrid.*;
 import org.compiere.model.*;
-import org.compiere.plaf.*;
 import org.compiere.swing.*;
 import org.compiere.util.*;
 
diff --git a/client/src/org/compiere/apps/search/InfoInvoice.java b/client/src/org/compiere/apps/search/InfoInvoice.java
index d9b4cc68be..ffe0cc9c43 100644
--- a/client/src/org/compiere/apps/search/InfoInvoice.java
+++ b/client/src/org/compiere/apps/search/InfoInvoice.java
@@ -26,7 +26,6 @@ import org.compiere.apps.*;
 import org.compiere.grid.ed.*;
 import org.compiere.minigrid.*;
 import org.compiere.model.*;
-import org.compiere.plaf.*;
 import org.compiere.swing.*;
 import org.compiere.util.*;
 
diff --git a/client/src/org/compiere/apps/search/InfoOrder.java b/client/src/org/compiere/apps/search/InfoOrder.java
index 8b5b7740eb..6284021e1a 100644
--- a/client/src/org/compiere/apps/search/InfoOrder.java
+++ b/client/src/org/compiere/apps/search/InfoOrder.java
@@ -26,7 +26,6 @@ import org.compiere.apps.*;
 import org.compiere.grid.ed.*;
 import org.compiere.minigrid.*;
 import org.compiere.model.*;
-import org.compiere.plaf.*;
 import org.compiere.swing.*;
 import org.compiere.util.*;
 
diff --git a/client/src/org/compiere/apps/search/InfoPayment.java b/client/src/org/compiere/apps/search/InfoPayment.java
index bfdfc0e3c3..cdc02d6a66 100644
--- a/client/src/org/compiere/apps/search/InfoPayment.java
+++ b/client/src/org/compiere/apps/search/InfoPayment.java
@@ -26,7 +26,6 @@ import org.compiere.apps.*;
 import org.compiere.grid.ed.*;
 import org.compiere.minigrid.*;
 import org.compiere.model.*;
-import org.compiere.plaf.*;
 import org.compiere.swing.*;
 import org.compiere.util.*;
 
diff --git a/client/src/org/compiere/apps/search/InfoProduct.java b/client/src/org/compiere/apps/search/InfoProduct.java
index 4529e2998d..21f943dbea 100644
--- a/client/src/org/compiere/apps/search/InfoProduct.java
+++ b/client/src/org/compiere/apps/search/InfoProduct.java
@@ -28,7 +28,6 @@ import org.compiere.apps.*;
 import org.compiere.grid.ed.*;
 import org.compiere.minigrid.*;
 import org.compiere.model.*;
-import org.compiere.plaf.*;
 import org.compiere.swing.*;
 import org.compiere.util.*;
 
diff --git a/client/src/org/compiere/grid/VCreateFromShipment.java b/client/src/org/compiere/grid/VCreateFromShipment.java
index 2cad083299..b381b78794 100644
--- a/client/src/org/compiere/grid/VCreateFromShipment.java
+++ b/client/src/org/compiere/grid/VCreateFromShipment.java
@@ -27,7 +27,6 @@ import javax.swing.table.*;
 import org.adempiere.plaf.AdempierePLAF;
 import org.compiere.grid.ed.*;
 import org.compiere.model.*;
-import org.compiere.plaf.*;
 import org.compiere.util.*;
 
 /**
diff --git a/client/src/org/compiere/grid/VPayment.java b/client/src/org/compiere/grid/VPayment.java
index b4f2a627c9..4b2f6c19e9 100644
--- a/client/src/org/compiere/grid/VPayment.java
+++ b/client/src/org/compiere/grid/VPayment.java
@@ -29,7 +29,6 @@ import org.adempiere.plaf.AdempierePLAF;
 import org.compiere.apps.*;
 import org.compiere.grid.ed.*;
 import org.compiere.model.*;
-import org.compiere.plaf.*;
 import org.compiere.process.*;
 import org.compiere.swing.*;
 import org.compiere.util.*;
diff --git a/client/src/org/compiere/grid/ed/Calendar.java b/client/src/org/compiere/grid/ed/Calendar.java
index 860df89f01..7e1a3bd543 100644
--- a/client/src/org/compiere/grid/ed/Calendar.java
+++ b/client/src/org/compiere/grid/ed/Calendar.java
@@ -26,7 +26,6 @@ import javax.swing.*;
 import javax.swing.event.*;
 
 import org.adempiere.plaf.AdempierePLAF;
-import org.compiere.plaf.*;
 import org.compiere.swing.*;
 import org.compiere.util.*;
 
diff --git a/client/src/org/compiere/grid/ed/Editor.java b/client/src/org/compiere/grid/ed/Editor.java
index 7ddceb616f..d59ccc4bbc 100644
--- a/client/src/org/compiere/grid/ed/Editor.java
+++ b/client/src/org/compiere/grid/ed/Editor.java
@@ -24,7 +24,6 @@ import javax.swing.event.*;
 
 import org.adempiere.plaf.AdempierePLAF;
 import org.compiere.apps.*;
-import org.compiere.plaf.*;
 import org.compiere.swing.*;
 import java.util.logging.*;
 import org.compiere.util.*;
diff --git a/client/src/org/compiere/grid/ed/VAccount.java b/client/src/org/compiere/grid/ed/VAccount.java
index 99b3e47116..310d077bb5 100644
--- a/client/src/org/compiere/grid/ed/VAccount.java
+++ b/client/src/org/compiere/grid/ed/VAccount.java
@@ -24,7 +24,6 @@ import javax.swing.*;
 
 import org.adempiere.plaf.AdempierePLAF;
 import org.compiere.model.*;
-import org.compiere.plaf.*;
 import org.compiere.swing.*;
 import java.util.logging.*;
 import org.compiere.util.*;
diff --git a/client/src/org/compiere/grid/ed/VAssignment.java b/client/src/org/compiere/grid/ed/VAssignment.java
index ec47bf9c81..47796609f8 100644
--- a/client/src/org/compiere/grid/ed/VAssignment.java
+++ b/client/src/org/compiere/grid/ed/VAssignment.java
@@ -26,7 +26,6 @@ import javax.swing.*;
 import org.adempiere.plaf.AdempierePLAF;
 import org.compiere.apps.search.*;
 import org.compiere.model.*;
-import org.compiere.plaf.*;
 import org.compiere.swing.*;
 import java.util.logging.*;
 import org.compiere.util.*;
diff --git a/client/src/org/compiere/grid/ed/VBPartner.java b/client/src/org/compiere/grid/ed/VBPartner.java
index af42bc337a..269423d8e3 100644
--- a/client/src/org/compiere/grid/ed/VBPartner.java
+++ b/client/src/org/compiere/grid/ed/VBPartner.java
@@ -24,7 +24,6 @@ import javax.swing.*;
 import org.adempiere.plaf.AdempierePLAF;
 import org.compiere.apps.*;
 import org.compiere.model.*;
-import org.compiere.plaf.*;
 import org.compiere.swing.*;
 import org.compiere.util.*;
 
diff --git a/client/src/org/compiere/grid/ed/VCellEditor.java b/client/src/org/compiere/grid/ed/VCellEditor.java
index 806b8cee71..6394872939 100644
--- a/client/src/org/compiere/grid/ed/VCellEditor.java
+++ b/client/src/org/compiere/grid/ed/VCellEditor.java
@@ -25,7 +25,6 @@ import javax.swing.table.*;
 
 import org.adempiere.plaf.AdempierePLAF;
 import org.compiere.model.*;
-import org.compiere.plaf.*;
 import org.compiere.util.*;
 
 /**
diff --git a/client/src/org/compiere/grid/ed/VCellRenderer.java b/client/src/org/compiere/grid/ed/VCellRenderer.java
index 75c0989c28..299cf27ee6 100644
--- a/client/src/org/compiere/grid/ed/VCellRenderer.java
+++ b/client/src/org/compiere/grid/ed/VCellRenderer.java
@@ -24,7 +24,6 @@ import javax.swing.table.*;
 import org.adempiere.plaf.AdempierePLAF;
 import org.compiere.apps.graph.*;
 import org.compiere.model.*;
-import org.compiere.plaf.*;
 import java.util.logging.*;
 import org.compiere.util.*;
 
diff --git a/client/src/org/compiere/grid/ed/VColor.java b/client/src/org/compiere/grid/ed/VColor.java
index bdceb94894..370bd8145b 100644
--- a/client/src/org/compiere/grid/ed/VColor.java
+++ b/client/src/org/compiere/grid/ed/VColor.java
@@ -24,7 +24,6 @@ import java.sql.*;
 import java.util.logging.*;
 import javax.swing.*;
 
-import org.adempiere.plaf.AdempierePLAF;
 import org.compiere.model.*;
 import org.compiere.plaf.*;
 import org.compiere.swing.*;
diff --git a/client/src/org/compiere/grid/ed/VDate.java b/client/src/org/compiere/grid/ed/VDate.java
index 214b8c9bf5..2a3e3c1379 100644
--- a/client/src/org/compiere/grid/ed/VDate.java
+++ b/client/src/org/compiere/grid/ed/VDate.java
@@ -28,7 +28,6 @@ import javax.swing.text.*;
 import org.adempiere.plaf.AdempierePLAF;
 import org.compiere.apps.*;
 import org.compiere.model.*;
-import org.compiere.plaf.*;
 import org.compiere.swing.*;
 import org.compiere.util.*;
 
diff --git a/client/src/org/compiere/grid/ed/VDocAction.java b/client/src/org/compiere/grid/ed/VDocAction.java
index 97115ae5c9..71c28c43a9 100644
--- a/client/src/org/compiere/grid/ed/VDocAction.java
+++ b/client/src/org/compiere/grid/ed/VDocAction.java
@@ -26,7 +26,6 @@ import javax.swing.*;
 import org.adempiere.plaf.AdempierePLAF;
 import org.compiere.apps.*;
 import org.compiere.model.*;
-import org.compiere.plaf.*;
 import org.compiere.process.*;
 import org.compiere.swing.*;
 import org.compiere.util.*;
diff --git a/client/src/org/compiere/grid/ed/VFile.java b/client/src/org/compiere/grid/ed/VFile.java
index 5163a22f4d..9d1e919a0a 100644
--- a/client/src/org/compiere/grid/ed/VFile.java
+++ b/client/src/org/compiere/grid/ed/VFile.java
@@ -24,7 +24,6 @@ import java.io.*;
 import javax.swing.*;
 
 import org.adempiere.plaf.AdempierePLAF;
-import org.compiere.plaf.*;
 import org.compiere.swing.*;
 import org.compiere.util.*;
 
diff --git a/client/src/org/compiere/grid/ed/VLine.java b/client/src/org/compiere/grid/ed/VLine.java
index ad4920ed78..a635c5a44a 100644
--- a/client/src/org/compiere/grid/ed/VLine.java
+++ b/client/src/org/compiere/grid/ed/VLine.java
@@ -20,7 +20,6 @@ import java.awt.*;
 import javax.swing.border.*;
 
 import org.adempiere.plaf.AdempierePLAF;
-import org.compiere.plaf.*;
 import org.compiere.util.*;
 
 /**
diff --git a/client/src/org/compiere/grid/ed/VLocation.java b/client/src/org/compiere/grid/ed/VLocation.java
index d20a91efc5..7c250e73dc 100644
--- a/client/src/org/compiere/grid/ed/VLocation.java
+++ b/client/src/org/compiere/grid/ed/VLocation.java
@@ -23,7 +23,6 @@ import javax.swing.*;
 
 import org.adempiere.plaf.AdempierePLAF;
 import org.compiere.model.*;
-import org.compiere.plaf.*;
 import org.compiere.swing.*;
 import java.util.logging.*;
 import org.compiere.util.*;
diff --git a/client/src/org/compiere/grid/ed/VLocator.java b/client/src/org/compiere/grid/ed/VLocator.java
index e28dfb4bca..dd1fef2477 100644
--- a/client/src/org/compiere/grid/ed/VLocator.java
+++ b/client/src/org/compiere/grid/ed/VLocator.java
@@ -26,7 +26,6 @@ import javax.swing.*;
 import org.adempiere.plaf.AdempierePLAF;
 import org.compiere.apps.*;
 import org.compiere.model.*;
-import org.compiere.plaf.*;
 import org.compiere.swing.*;
 import org.compiere.util.*;
 
diff --git a/client/src/org/compiere/grid/ed/VLocatorDialog.java b/client/src/org/compiere/grid/ed/VLocatorDialog.java
index fa34fc528b..33bc58762c 100644
--- a/client/src/org/compiere/grid/ed/VLocatorDialog.java
+++ b/client/src/org/compiere/grid/ed/VLocatorDialog.java
@@ -25,7 +25,6 @@ import javax.swing.*;
 import org.adempiere.plaf.AdempierePLAF;
 import org.compiere.apps.*;
 import org.compiere.model.*;
-import org.compiere.plaf.*;
 import org.compiere.swing.*;
 import org.compiere.util.*;
 
diff --git a/client/src/org/compiere/grid/ed/VMemo.java b/client/src/org/compiere/grid/ed/VMemo.java
index dbe9c6f2dd..d2b0a4af3a 100644
--- a/client/src/org/compiere/grid/ed/VMemo.java
+++ b/client/src/org/compiere/grid/ed/VMemo.java
@@ -23,7 +23,6 @@ import javax.swing.*;
 
 import org.adempiere.plaf.AdempierePLAF;
 import org.compiere.apps.*;
-import org.compiere.plaf.*;
 import org.compiere.swing.*;
 import org.compiere.util.*;
 
diff --git a/client/src/org/compiere/grid/ed/VPAttribute.java b/client/src/org/compiere/grid/ed/VPAttribute.java
index a12fcf45cf..e74b8eb779 100644
--- a/client/src/org/compiere/grid/ed/VPAttribute.java
+++ b/client/src/org/compiere/grid/ed/VPAttribute.java
@@ -24,7 +24,6 @@ import javax.swing.*;
 
 import org.adempiere.plaf.AdempierePLAF;
 import org.compiere.model.*;
-import org.compiere.plaf.*;
 import org.compiere.swing.*;
 import org.compiere.util.*;
 
diff --git a/client/src/org/compiere/grid/ed/VPassword.java b/client/src/org/compiere/grid/ed/VPassword.java
index e11bdec085..d67196428a 100644
--- a/client/src/org/compiere/grid/ed/VPassword.java
+++ b/client/src/org/compiere/grid/ed/VPassword.java
@@ -20,7 +20,6 @@ import java.awt.event.*;
 import java.beans.*;
 
 import org.adempiere.plaf.AdempierePLAF;
-import org.compiere.plaf.*;
 import org.compiere.swing.*;
 import org.compiere.model.*;
 
diff --git a/client/src/org/compiere/grid/ed/VString.java b/client/src/org/compiere/grid/ed/VString.java
index f45f949d62..b67e0ad0a5 100644
--- a/client/src/org/compiere/grid/ed/VString.java
+++ b/client/src/org/compiere/grid/ed/VString.java
@@ -23,7 +23,6 @@ import javax.swing.*;
 
 import org.adempiere.plaf.AdempierePLAF;
 import org.compiere.model.*;
-import org.compiere.plaf.*;
 import org.compiere.swing.*;
 import org.compiere.util.*;
 
diff --git a/client/src/org/compiere/grid/ed/VText.java b/client/src/org/compiere/grid/ed/VText.java
index b9431b8e01..b392094998 100644
--- a/client/src/org/compiere/grid/ed/VText.java
+++ b/client/src/org/compiere/grid/ed/VText.java
@@ -23,7 +23,6 @@ import javax.swing.*;
 
 import org.adempiere.plaf.AdempierePLAF;
 import org.compiere.apps.*;
-import org.compiere.plaf.*;
 import org.compiere.swing.*;
 import org.compiere.util.*;
 
diff --git a/client/src/org/compiere/grid/ed/VTextLong.java b/client/src/org/compiere/grid/ed/VTextLong.java
index 3e42e12746..a776367110 100644
--- a/client/src/org/compiere/grid/ed/VTextLong.java
+++ b/client/src/org/compiere/grid/ed/VTextLong.java
@@ -22,7 +22,6 @@ import java.beans.*;
 import javax.swing.*;
 
 import org.adempiere.plaf.AdempierePLAF;
-import org.compiere.plaf.*;
 import org.compiere.swing.*;
 import org.compiere.util.*;
 
diff --git a/client/src/org/compiere/grid/ed/VURL.java b/client/src/org/compiere/grid/ed/VURL.java
index 19f776d35b..56413d931c 100644
--- a/client/src/org/compiere/grid/ed/VURL.java
+++ b/client/src/org/compiere/grid/ed/VURL.java
@@ -25,7 +25,6 @@ import javax.swing.*;
 import org.adempiere.plaf.AdempierePLAF;
 import org.compiere.apps.*;
 import org.compiere.model.*;
-import org.compiere.plaf.*;
 import org.compiere.swing.*;
 import org.compiere.util.*;
 
diff --git a/client/src/org/compiere/grid/tree/VTreePanel.java b/client/src/org/compiere/grid/tree/VTreePanel.java
index 3322c4a5ae..849bbe153e 100644
--- a/client/src/org/compiere/grid/tree/VTreePanel.java
+++ b/client/src/org/compiere/grid/tree/VTreePanel.java
@@ -23,7 +23,6 @@ import java.awt.dnd.*;
 import java.awt.event.*;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
-import java.sql.*;
 import java.util.*;
 import java.util.logging.*;
 import javax.swing.*;
@@ -34,7 +33,6 @@ import javax.swing.tree.*;
 import org.adempiere.plaf.AdempierePLAF;
 import org.compiere.apps.*;
 import org.compiere.model.*;
-import org.compiere.plaf.*;
 import org.compiere.swing.*;
 import org.compiere.util.*;
 
diff --git a/client/src/org/compiere/minigrid/CheckRenderer.java b/client/src/org/compiere/minigrid/CheckRenderer.java
index ff76aab723..3071d815ab 100644
--- a/client/src/org/compiere/minigrid/CheckRenderer.java
+++ b/client/src/org/compiere/minigrid/CheckRenderer.java
@@ -21,7 +21,6 @@ import javax.swing.table.*;
 import java.awt.*;
 
 import org.adempiere.plaf.AdempierePLAF;
-import org.compiere.plaf.*;
 
 /**
  *  Check Box Renderer based on Boolean values
diff --git a/client/src/org/compiere/pos/SubCheckout.java b/client/src/org/compiere/pos/SubCheckout.java
index 558d3b06b4..34fd444b1c 100644
--- a/client/src/org/compiere/pos/SubCheckout.java
+++ b/client/src/org/compiere/pos/SubCheckout.java
@@ -16,9 +16,7 @@ package org.compiere.pos;
 
 import java.awt.*;
 import java.awt.event.*;
-import java.io.*;
 import java.math.*;
-import java.util.Properties;
 
 import javax.swing.border.TitledBorder;
 
diff --git a/dbPort/src/org/compiere/Adempiere.java b/dbPort/src/org/compiere/Adempiere.java
index 7c015ef073..a7acbc736c 100644
--- a/dbPort/src/org/compiere/Adempiere.java
+++ b/dbPort/src/org/compiere/Adempiere.java
@@ -26,7 +26,6 @@ import javax.swing.*;
 import org.adempiere.plaf.AdempierePLAF;
 import org.compiere.db.*;
 import org.compiere.model.*;
-import org.compiere.plaf.*;
 import org.compiere.util.*;
 
 /**
diff --git a/dbPort/src/org/compiere/db/CConnectionDialog.java b/dbPort/src/org/compiere/db/CConnectionDialog.java
index ad0eb30cdd..0acf75e1a4 100644
--- a/dbPort/src/org/compiere/db/CConnectionDialog.java
+++ b/dbPort/src/org/compiere/db/CConnectionDialog.java
@@ -23,7 +23,6 @@ import java.util.logging.*;
 import javax.swing.*;
 
 import org.adempiere.plaf.AdempierePLAF;
-import org.compiere.plaf.*;
 import org.compiere.swing.*;
 import org.compiere.util.*;
 
diff --git a/dbPort/src/org/compiere/db/CConnectionEditor.java b/dbPort/src/org/compiere/db/CConnectionEditor.java
index b4824e349b..c5bb656bc9 100644
--- a/dbPort/src/org/compiere/db/CConnectionEditor.java
+++ b/dbPort/src/org/compiere/db/CConnectionEditor.java
@@ -21,7 +21,6 @@ import java.awt.event.*;
 import javax.swing.*;
 
 import org.adempiere.plaf.AdempierePLAF;
-import org.compiere.plaf.*;
 import org.compiere.swing.*;
 
 /**
diff --git a/dbPort/src/org/compiere/db/DB_Fyracle.java b/dbPort/src/org/compiere/db/DB_Fyracle.java
index bd0322012d..d57fefd91c 100644
--- a/dbPort/src/org/compiere/db/DB_Fyracle.java
+++ b/dbPort/src/org/compiere/db/DB_Fyracle.java
@@ -14,15 +14,12 @@
 package org.compiere.db;
 
 import java.io.PrintWriter;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Proxy;
 import java.math.BigDecimal;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.sql.Timestamp;
-import java.util.Properties;
 import java.util.logging.Level;
 
 import javax.sql.DataSource;
@@ -32,7 +29,6 @@ import org.compiere.dbPort.Convert_Oracle;
 import org.compiere.util.CLogger;
 import org.compiere.util.DisplayType;
 import org.compiere.util.Language;
-import org.firebirdsql.jdbc.FBConnection;
 import org.firebirdsql.pool.DriverConnectionPoolDataSource;
 import org.firebirdsql.pool.FBWrappingDataSource;
 
diff --git a/dbPort/src/org/compiere/dbPort/Convert.java b/dbPort/src/org/compiere/dbPort/Convert.java
index 67b3262876..241a4288bc 100644
--- a/dbPort/src/org/compiere/dbPort/Convert.java
+++ b/dbPort/src/org/compiere/dbPort/Convert.java
@@ -25,7 +25,6 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.compiere.util.CLogger;
-import org.compiere.util.Util;
 
 /**
  *  Convert SQL to Target DB
diff --git a/dbPort/src/org/compiere/model/MPackageExp.java b/dbPort/src/org/compiere/model/MPackageExp.java
index e30bf82220..d29b5b6839 100644
--- a/dbPort/src/org/compiere/model/MPackageExp.java
+++ b/dbPort/src/org/compiere/model/MPackageExp.java
@@ -19,7 +19,6 @@ package org.compiere.model;
 
 import java.sql.*;
 import java.util.*;
-import java.util.logging.*;
 
 import org.compiere.model.X_AD_Package_Exp_Detail;
 import org.compiere.model.X_AD_Package_Exp;
diff --git a/dbPort/src/org/compiere/model/MPackageExpCommon.java b/dbPort/src/org/compiere/model/MPackageExpCommon.java
index 081997a3f5..56bb9b6ade 100644
--- a/dbPort/src/org/compiere/model/MPackageExpCommon.java
+++ b/dbPort/src/org/compiere/model/MPackageExpCommon.java
@@ -19,8 +19,6 @@ package org.compiere.model;
 
 import java.sql.*;
 import java.util.*;
-import java.util.logging.*;
-import org.compiere.model.X_AD_Package_Exp_Detail;
 import org.compiere.util.*;
 
 /**
diff --git a/dbPort/src/org/compiere/model/MPackageExpDetail.java b/dbPort/src/org/compiere/model/MPackageExpDetail.java
index 0598906587..6dc4d10c25 100644
--- a/dbPort/src/org/compiere/model/MPackageExpDetail.java
+++ b/dbPort/src/org/compiere/model/MPackageExpDetail.java
@@ -19,7 +19,6 @@ package org.compiere.model;
 
 import java.sql.*;
 import java.util.*;
-import java.util.logging.*;
 import org.compiere.model.X_AD_Package_Exp_Detail;
 import org.compiere.util.*;
 
diff --git a/dbPort/src/org/compiere/model/MUser.java b/dbPort/src/org/compiere/model/MUser.java
index 9ade02f273..c5f1af43b9 100644
--- a/dbPort/src/org/compiere/model/MUser.java
+++ b/dbPort/src/org/compiere/model/MUser.java
@@ -20,8 +20,6 @@ import java.sql.*;
 import java.util.*;
 import java.util.logging.*;
 import javax.mail.internet.*;
-import javax.naming.*;
-import javax.naming.directory.*;
 
 import org.compiere.util.*;
 
diff --git a/dbPort/src/org/compiere/util/AmtInWords_FA.java b/dbPort/src/org/compiere/util/AmtInWords_FA.java
index 263b4b1946..9bcf0415d8 100644
--- a/dbPort/src/org/compiere/util/AmtInWords_FA.java
+++ b/dbPort/src/org/compiere/util/AmtInWords_FA.java
@@ -16,9 +16,6 @@
  *****************************************************************************/
 package org.compiere.util;
 
-import org.compiere.util.*;
-
-
 /**
  *	Amount in Words for Persian
  *
diff --git a/dbPort/src/org/compiere/util/CLogErrorBuffer.java b/dbPort/src/org/compiere/util/CLogErrorBuffer.java
index b91d0a2dc2..04af09be66 100644
--- a/dbPort/src/org/compiere/util/CLogErrorBuffer.java
+++ b/dbPort/src/org/compiere/util/CLogErrorBuffer.java
@@ -20,8 +20,6 @@ import java.sql.*;
 import java.util.*;
 import java.util.logging.*;
 
-import javax.swing.JOptionPane;
-
 import org.compiere.model.*;
 
 /**
diff --git a/dbPort/src/org/compiere/util/CPreparedStatement.java b/dbPort/src/org/compiere/util/CPreparedStatement.java
index decc2a89ee..8a3aefa72e 100644
--- a/dbPort/src/org/compiere/util/CPreparedStatement.java
+++ b/dbPort/src/org/compiere/util/CPreparedStatement.java
@@ -19,7 +19,6 @@ package org.compiere.util;
 import java.io.*;
 import java.math.*;
 import java.net.*;
-import java.rmi.*;
 import java.sql.*;
 import java.util.*;
 import java.util.logging.*;
diff --git a/dbPort/src/org/compiere/util/CStatement.java b/dbPort/src/org/compiere/util/CStatement.java
index 0d6174fc2c..1294bd2a8d 100644
--- a/dbPort/src/org/compiere/util/CStatement.java
+++ b/dbPort/src/org/compiere/util/CStatement.java
@@ -16,10 +16,7 @@
  *****************************************************************************/
 package org.compiere.util;
 
-import java.math.*;
-import java.rmi.*;
 import java.sql.*;
-import java.util.*;
 import java.util.logging.*;
 
 import javax.sql.*;
diff --git a/install/src/org/compiere/install/ConfigurationPanel.java b/install/src/org/compiere/install/ConfigurationPanel.java
index 4ad13f14f6..222ae8a2af 100644
--- a/install/src/org/compiere/install/ConfigurationPanel.java
+++ b/install/src/org/compiere/install/ConfigurationPanel.java
@@ -22,11 +22,8 @@ import java.util.*;
 import java.util.logging.*;
 import javax.swing.*;
 import javax.swing.border.TitledBorder;
-import javax.swing.plaf.metal.MetalLookAndFeel;
-
 import org.apache.tools.ant.*;
 import org.compiere.*;
-import org.compiere.apps.*;
 import org.compiere.swing.*;
 import org.compiere.util.*;
 
diff --git a/looks/src/org/adempiere/plaf/AdempiereTheme.java b/looks/src/org/adempiere/plaf/AdempiereTheme.java
index 513698f980..72635ec63d 100755
--- a/looks/src/org/adempiere/plaf/AdempiereTheme.java
+++ b/looks/src/org/adempiere/plaf/AdempiereTheme.java
@@ -28,10 +28,8 @@ import javax.swing.plaf.FontUIResource;
 //import org.compiere.plaf.ColorBlind;
 import org.compiere.swing.ColorBlind;
 import org.compiere.swing.ExtendedTheme;
-import org.compiere.util.Ini;
 
 import com.jgoodies.looks.plastic.PlasticScrollBarUI;
-import com.jgoodies.looks.plastic.theme.*;
 
 
 /**
diff --git a/looks/src/org/adempiere/plaf/AdempiereThemeInnova.java b/looks/src/org/adempiere/plaf/AdempiereThemeInnova.java
index 7365e5eda4..d49785171b 100644
--- a/looks/src/org/adempiere/plaf/AdempiereThemeInnova.java
+++ b/looks/src/org/adempiere/plaf/AdempiereThemeInnova.java
@@ -13,7 +13,6 @@
  *****************************************************************************/
 package org.adempiere.plaf;
 
-import java.awt.*;
 import javax.swing.plaf.*;
 
 /**
diff --git a/looks/src/org/adempiere/plaf/PLAFEditor.java b/looks/src/org/adempiere/plaf/PLAFEditor.java
index 6f19668e25..6f5c447698 100644
--- a/looks/src/org/adempiere/plaf/PLAFEditor.java
+++ b/looks/src/org/adempiere/plaf/PLAFEditor.java
@@ -26,7 +26,6 @@ import javax.swing.plaf.metal.*;
 
 import org.compiere.plaf.CompiereColor;
 import org.compiere.plaf.CompiereLookAndFeel;
-import org.compiere.plaf.CompiereThemeEditor;
 import org.compiere.swing.*;
 import org.compiere.util.*;
 
diff --git a/looks/src/org/compiere/plaf/CompierePanelUI.java b/looks/src/org/compiere/plaf/CompierePanelUI.java
index 60b537de41..0994d8e439 100644
--- a/looks/src/org/compiere/plaf/CompierePanelUI.java
+++ b/looks/src/org/compiere/plaf/CompierePanelUI.java
@@ -21,8 +21,6 @@ import javax.swing.*;
 import javax.swing.plaf.*;
 import javax.swing.plaf.basic.*;
 
-import org.adempiere.plaf.AdempierePLAF;
-
 /**
  *  Panel UI.
  *  The default properties can be set via
diff --git a/looks/src/org/compiere/plaf/CompiereTabbedPaneUI.java b/looks/src/org/compiere/plaf/CompiereTabbedPaneUI.java
index ac92a951b1..5685c36d85 100644
--- a/looks/src/org/compiere/plaf/CompiereTabbedPaneUI.java
+++ b/looks/src/org/compiere/plaf/CompiereTabbedPaneUI.java
@@ -22,8 +22,6 @@ import javax.swing.plaf.*;
 import javax.swing.plaf.basic.*;
 import javax.swing.plaf.metal.*;
 
-import org.adempiere.plaf.AdempierePLAF;
-
 /**
  *  Same implementation detail as in AdempierePanelUI.
  *  Additional handling of dwawing tabs.
diff --git a/looks/src/org/compiere/plaf/CompiereTheme.java b/looks/src/org/compiere/plaf/CompiereTheme.java
index 73eef28db1..97c8584f5d 100644
--- a/looks/src/org/compiere/plaf/CompiereTheme.java
+++ b/looks/src/org/compiere/plaf/CompiereTheme.java
@@ -25,9 +25,6 @@ import javax.swing.plaf.metal.*;
 
 import org.compiere.swing.ColorBlind;
 import org.compiere.swing.ExtendedTheme;
-import org.compiere.util.*;
-
-import sun.awt.*;
 
 /**
  *  Compiere User definable Theme (if used in Metal L&F).
diff --git a/looks/src/org/compiere/plaf/CompiereThemeBlueMetal.java b/looks/src/org/compiere/plaf/CompiereThemeBlueMetal.java
index ec94d7704f..7df80b878d 100644
--- a/looks/src/org/compiere/plaf/CompiereThemeBlueMetal.java
+++ b/looks/src/org/compiere/plaf/CompiereThemeBlueMetal.java
@@ -18,7 +18,6 @@ package org.compiere.plaf;
 
 import java.awt.*;
 
-import javax.swing.UIDefaults;
 import javax.swing.plaf.*;
 
 /**
diff --git a/looks/src/org/compiere/plaf/CompiereUtils.java b/looks/src/org/compiere/plaf/CompiereUtils.java
index 2f1423893e..dcef39da61 100644
--- a/looks/src/org/compiere/plaf/CompiereUtils.java
+++ b/looks/src/org/compiere/plaf/CompiereUtils.java
@@ -24,8 +24,6 @@ import java.net.*;
 import java.util.logging.*;
 import javax.swing.*;
 
-import org.adempiere.plaf.AdempierePLAF;
-
 import com.sun.image.codec.jpeg.*;
 
 /**
diff --git a/looks/src/org/compiere/swing/CButton.java b/looks/src/org/compiere/swing/CButton.java
index 3d6cc75639..ed35dbf9eb 100644
--- a/looks/src/org/compiere/swing/CButton.java
+++ b/looks/src/org/compiere/swing/CButton.java
@@ -21,7 +21,6 @@ import javax.swing.*;
 
 import org.adempiere.plaf.AdempierePLAF;
 import org.compiere.plaf.*;
-import org.compiere.util.*;
 
 /**
  *  Adempiere Button supporting colored Background
diff --git a/looks/src/org/compiere/swing/CCheckBox.java b/looks/src/org/compiere/swing/CCheckBox.java
index c12ee7f6c9..20b194cece 100644
--- a/looks/src/org/compiere/swing/CCheckBox.java
+++ b/looks/src/org/compiere/swing/CCheckBox.java
@@ -22,8 +22,6 @@ import javax.swing.Action;
 import javax.swing.Icon;
 import javax.swing.JCheckBox;
 
-import org.adempiere.plaf.AdempierePLAF;
-
 /**
  *  Adempiere CheckBox
  *
diff --git a/looks/src/org/compiere/swing/CDialog.java b/looks/src/org/compiere/swing/CDialog.java
index a773f357d2..8728223d38 100644
--- a/looks/src/org/compiere/swing/CDialog.java
+++ b/looks/src/org/compiere/swing/CDialog.java
@@ -20,8 +20,6 @@ import javax.swing.*;
 import java.awt.*;
 import java.awt.event.*;
 
-import org.compiere.plaf.*;
-
 /**
  *	Conveniance Dialog Class.
  *	Adempiere Background + Dispose on Close  
diff --git a/looks/src/org/compiere/swing/CFrame.java b/looks/src/org/compiere/swing/CFrame.java
index 306f57c376..0ddcfeffd8 100644
--- a/looks/src/org/compiere/swing/CFrame.java
+++ b/looks/src/org/compiere/swing/CFrame.java
@@ -18,7 +18,6 @@ package org.compiere.swing;
 
 import java.awt.*;
 import javax.swing.*;
-import org.compiere.plaf.*;
 
 /**
  * 	Adempiere Frame
diff --git a/looks/src/org/compiere/swing/CLabel.java b/looks/src/org/compiere/swing/CLabel.java
index ddba01532f..d0c9d6dcd8 100644
--- a/looks/src/org/compiere/swing/CLabel.java
+++ b/looks/src/org/compiere/swing/CLabel.java
@@ -20,8 +20,6 @@ import java.awt.*;
 
 import javax.swing.*;
 
-import org.compiere.plaf.*;
-
 /**
  *  Label with Mnemonics interpretation
  *
diff --git a/looks/src/org/compiere/swing/CTabbedPane.java b/looks/src/org/compiere/swing/CTabbedPane.java
index 8a7b959926..eba8ea0957 100644
--- a/looks/src/org/compiere/swing/CTabbedPane.java
+++ b/looks/src/org/compiere/swing/CTabbedPane.java
@@ -25,8 +25,6 @@ import javax.swing.*;
 import org.adempiere.plaf.AdempierePLAF;
 import org.compiere.plaf.CompiereColor;
 import org.compiere.plaf.CompiereLookAndFeel;
-import org.compiere.plaf.CompierePanelUI;
-import org.compiere.util.Trace;
 import sun.swing.*;
 
 /**
diff --git a/looks/src/org/compiere/swing/CTextArea.java b/looks/src/org/compiere/swing/CTextArea.java
index f7d5f9df53..a7805384c1 100644
--- a/looks/src/org/compiere/swing/CTextArea.java
+++ b/looks/src/org/compiere/swing/CTextArea.java
@@ -24,7 +24,6 @@ import javax.swing.*;
 import javax.swing.text.*;
 
 import org.adempiere.plaf.AdempierePLAF;
-import org.compiere.plaf.*;
 
 /**
  *  Adempiere TextArea - A ScrollPane with a JTextArea.
diff --git a/looks/src/org/compiere/swing/CTextField.java b/looks/src/org/compiere/swing/CTextField.java
index 54586011b5..6749460e1b 100644
--- a/looks/src/org/compiere/swing/CTextField.java
+++ b/looks/src/org/compiere/swing/CTextField.java
@@ -23,7 +23,6 @@ import javax.swing.*;
 import javax.swing.text.*;
 
 import org.adempiere.plaf.AdempierePLAF;
-import org.compiere.plaf.*;
 
 /**
  *  Adempiere Text Field
diff --git a/looks/src/org/compiere/swing/CTextPane.java b/looks/src/org/compiere/swing/CTextPane.java
index 99700a2893..b4336ffad6 100644
--- a/looks/src/org/compiere/swing/CTextPane.java
+++ b/looks/src/org/compiere/swing/CTextPane.java
@@ -24,7 +24,6 @@ import javax.swing.*;
 import javax.swing.text.*;
 
 import org.adempiere.plaf.AdempierePLAF;
-import org.compiere.plaf.*;
 
 /**
  *	Adempiere TextPane - A ScrollPane with a JTextPane.
diff --git a/looks/src/org/compiere/swing/CToggleButton.java b/looks/src/org/compiere/swing/CToggleButton.java
index 2e596c1544..728125ea46 100644
--- a/looks/src/org/compiere/swing/CToggleButton.java
+++ b/looks/src/org/compiere/swing/CToggleButton.java
@@ -25,7 +25,6 @@ import javax.swing.JToggleButton;
 import org.adempiere.plaf.AdempierePLAF;
 import org.compiere.plaf.CompiereColor;
 import org.compiere.plaf.CompiereLookAndFeel;
-import org.compiere.util.Trace;
 
 /**
  *  Adempiere Color Taggle Button
diff --git a/looks/src/org/compiere/swing/ColorEditor.java b/looks/src/org/compiere/swing/ColorEditor.java
index 38abeb0473..16e65bb472 100644
--- a/looks/src/org/compiere/swing/ColorEditor.java
+++ b/looks/src/org/compiere/swing/ColorEditor.java
@@ -24,7 +24,6 @@ import javax.swing.*;
 
 import org.adempiere.plaf.AdempierePLAF;
 import org.compiere.plaf.CompiereColor;
-import org.compiere.swing.*;
 import org.compiere.util.*;
 
 /**
diff --git a/looks/src/org/compiere/swing/FontChooser.java b/looks/src/org/compiere/swing/FontChooser.java
index b6c4318463..942f58f322 100644
--- a/looks/src/org/compiere/swing/FontChooser.java
+++ b/looks/src/org/compiere/swing/FontChooser.java
@@ -22,7 +22,6 @@ import java.util.*;
 import javax.swing.*;
 
 import org.adempiere.plaf.AdempierePLAF;
-import org.compiere.swing.*;
 
 /**
  *  Font Chooser Dialog
diff --git a/looks/src/org/compiere/util/Ini.java b/looks/src/org/compiere/util/Ini.java
index 3605d480a3..adf53c54b2 100644
--- a/looks/src/org/compiere/util/Ini.java
+++ b/looks/src/org/compiere/util/Ini.java
@@ -22,7 +22,6 @@ import java.nio.charset.Charset;
 import java.sql.*;
 import java.util.*;
 import java.util.logging.*;
-import org.compiere.plaf.*;
 import org.adempiere.plaf.*;
 
 
diff --git a/looks/src/org/compiere/util/IniDialog.java b/looks/src/org/compiere/util/IniDialog.java
index d9fb5831e9..3d2c8eebfc 100644
--- a/looks/src/org/compiere/util/IniDialog.java
+++ b/looks/src/org/compiere/util/IniDialog.java
@@ -25,7 +25,6 @@ import javax.swing.*;
 
 import org.adempiere.plaf.AdempierePLAF;
 import org.compiere.swing.*;
-import org.compiere.plaf.*;
 
 /**
  *  Init Dialog
diff --git a/webCM/src/main/servlet/org/compiere/cm/Community.java b/webCM/src/main/servlet/org/compiere/cm/Community.java
index 8abc51d380..57fcc12d67 100644
--- a/webCM/src/main/servlet/org/compiere/cm/Community.java
+++ b/webCM/src/main/servlet/org/compiere/cm/Community.java
@@ -16,9 +16,7 @@
 package org.compiere.cm;
 
 import java.io.IOException;
-import java.util.Enumeration;
 import java.util.Properties;
-import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
diff --git a/webCM/src/main/servlet/org/compiere/cm/cache/WebProject.java b/webCM/src/main/servlet/org/compiere/cm/cache/WebProject.java
index e7d01c00a3..e9bbb2843c 100644
--- a/webCM/src/main/servlet/org/compiere/cm/cache/WebProject.java
+++ b/webCM/src/main/servlet/org/compiere/cm/cache/WebProject.java
@@ -16,7 +16,6 @@
  *****************************************************************************/
 package org.compiere.cm.cache;
 
-import java.util.*;
 import org.compiere.model.*;
 
 /**
diff --git a/webCM/src/main/servlet/org/compiere/cm/request/Request.java b/webCM/src/main/servlet/org/compiere/cm/request/Request.java
index cc3b3d2075..231e33e096 100644
--- a/webCM/src/main/servlet/org/compiere/cm/request/Request.java
+++ b/webCM/src/main/servlet/org/compiere/cm/request/Request.java
@@ -20,16 +20,11 @@ import java.sql.Timestamp;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.Enumeration;
 import java.util.Properties;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.compiere.model.MColumn;
 import org.compiere.model.MRequest;
-import org.compiere.model.MTable;
-import org.compiere.model.PO;
-import org.compiere.model.X_AD_Reference;
 import org.compiere.util.DB;
 
 /**
diff --git a/webCM/src/main/servlet/org/compiere/cm/utils/CMEnv.java b/webCM/src/main/servlet/org/compiere/cm/utils/CMEnv.java
index a89ab9bb5a..3105eef7ea 100644
--- a/webCM/src/main/servlet/org/compiere/cm/utils/CMEnv.java
+++ b/webCM/src/main/servlet/org/compiere/cm/utils/CMEnv.java
@@ -16,10 +16,8 @@
  *****************************************************************************/
 package org.compiere.cm.utils;
 
-import java.util.Enumeration;
 import java.util.Properties;
 
-import org.compiere.model.MClient;
 import org.compiere.util.Env;
 
 public class CMEnv {
diff --git a/webCM/src/main/servlet/org/compiere/cm/utils/RequestAnalyzer.java b/webCM/src/main/servlet/org/compiere/cm/utils/RequestAnalyzer.java
index 301fa55ee3..b93dc6b7b9 100644
--- a/webCM/src/main/servlet/org/compiere/cm/utils/RequestAnalyzer.java
+++ b/webCM/src/main/servlet/org/compiere/cm/utils/RequestAnalyzer.java
@@ -21,9 +21,7 @@ import javax.servlet.http.HttpSession;
 import java.lang.reflect.Constructor;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.sql.ResultSet;
 import java.util.Properties;
-import java.util.logging.Level;
 import org.compiere.model.*;
 import org.compiere.cm.cache.*;
 import org.compiere.cm.*;
diff --git a/webCM/src/main/servlet/org/compiere/cm/utils/TreeXML.java b/webCM/src/main/servlet/org/compiere/cm/utils/TreeXML.java
index f723a0753d..49f00d67d0 100644
--- a/webCM/src/main/servlet/org/compiere/cm/utils/TreeXML.java
+++ b/webCM/src/main/servlet/org/compiere/cm/utils/TreeXML.java
@@ -18,15 +18,11 @@ package org.compiere.cm.utils;
 
 import java.util.HashMap;
 import java.util.Properties;
-import java.util.logging.Level;
 
-import org.compiere.Adempiere;
-import org.compiere.model.MCStage;
 import org.compiere.model.MContainer;
 import org.compiere.model.MTree;
 import org.compiere.model.MTreeNode;
 import org.compiere.model.MWebProject;
-import org.compiere.util.CLogger;
 
 public class TreeXML {
 	protected StringBuffer xmlContainer = new StringBuffer(" ");
diff --git a/webCM/src/main/servlet/org/compiere/cm/xml/Generator.java b/webCM/src/main/servlet/org/compiere/cm/xml/Generator.java
index 45cebb4b68..689fda5296 100644
--- a/webCM/src/main/servlet/org/compiere/cm/xml/Generator.java
+++ b/webCM/src/main/servlet/org/compiere/cm/xml/Generator.java
@@ -50,7 +50,6 @@ import org.compiere.model.X_CM_TemplateTable;
 import org.compiere.util.DB;
 import org.compiere.util.Language;
 import org.compiere.util.WebInfo;
-import org.w3c.dom.Document;
 
 /**
  * This Generator builds up the XML for the XSLT Template Engine