diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WCharge.java b/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WCharge.java
index 8ed814751c..3529b49864 100644
--- a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WCharge.java
+++ b/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WCharge.java
@@ -26,7 +26,6 @@ import java.util.logging.Level;
 import org.adempiere.webui.component.Button;
 import org.adempiere.webui.component.Checkbox;
 import org.adempiere.webui.component.Column;
-import org.adempiere.webui.component.Columns;
 import org.adempiere.webui.component.ConfirmPanel;
 import org.adempiere.webui.component.Grid;
 import org.adempiere.webui.component.GridFactory;
@@ -36,7 +35,6 @@ import org.adempiere.webui.component.Panel;
 import org.adempiere.webui.component.Row;
 import org.adempiere.webui.component.Rows;
 import org.adempiere.webui.component.Textbox;
-import org.adempiere.webui.component.WAppsAction;
 import org.adempiere.webui.component.WListbox;
 import org.adempiere.webui.panel.ADForm;
 import org.adempiere.webui.panel.CustomForm;
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromShipmentUI.java b/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromShipmentUI.java
index 335b78b14f..08c267ac71 100644
--- a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromShipmentUI.java
+++ b/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromShipmentUI.java
@@ -20,17 +20,11 @@ import java.util.List;
 import java.util.Vector;
 import java.util.logging.Level;
 
-import javax.swing.JComboBox;
-import javax.swing.JLabel;
-import javax.swing.JTextField;
-import javax.swing.table.DefaultTableModel;
-
 import org.adempiere.webui.apps.AEnv;
 import org.adempiere.webui.component.Checkbox;
 import org.adempiere.webui.component.Grid;
 import org.adempiere.webui.component.GridFactory;
 import org.adempiere.webui.component.Label;
-import org.adempiere.webui.component.ListItem;
 import org.adempiere.webui.component.ListModelTable;
 import org.adempiere.webui.component.Listbox;
 import org.adempiere.webui.component.ListboxFactory;
@@ -45,7 +39,6 @@ import org.adempiere.webui.event.ValueChangeEvent;
 import org.adempiere.webui.event.ValueChangeListener;
 import org.compiere.grid.CreateFromShipment;
 import org.compiere.model.GridTab;
-import org.compiere.model.MDocType;
 import org.compiere.model.MInvoice;
 import org.compiere.model.MLocatorLookup;
 import org.compiere.model.MLookup;
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/graph/WGraph.java b/zkwebui/WEB-INF/src/org/adempiere/webui/apps/graph/WGraph.java
index ffd8c6ff6b..b4c519bfd2 100644
--- a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/graph/WGraph.java
+++ b/zkwebui/WEB-INF/src/org/adempiere/webui/apps/graph/WGraph.java
@@ -52,11 +52,9 @@ import org.zkoss.zk.ui.event.MouseEvent;
 import org.zkoss.zkex.zul.Borderlayout;
 import org.zkoss.zkex.zul.Center;
 import org.zkoss.zkex.zul.East;
-import org.zkoss.zkex.zul.West;
 import org.zkoss.zul.Area;
 import org.zkoss.zul.Button;
 import org.zkoss.zul.Div;
-import org.zkoss.zul.Hbox;
 import org.zkoss.zul.Html;
 import org.zkoss.zul.Imagemap;
 import org.zkoss.zul.Panel;
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/editor/WYesNoEditor.java b/zkwebui/WEB-INF/src/org/adempiere/webui/editor/WYesNoEditor.java
index 4b2d283489..9e0d7f9f3b 100644
--- a/zkwebui/WEB-INF/src/org/adempiere/webui/editor/WYesNoEditor.java
+++ b/zkwebui/WEB-INF/src/org/adempiere/webui/editor/WYesNoEditor.java
@@ -26,7 +26,6 @@ import org.compiere.model.GridField;
 import org.compiere.util.CLogger;
 import org.compiere.util.Env;
 import org.compiere.util.Msg;
-import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zk.ui.event.Events;
 
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/window/AboutWindow.java b/zkwebui/WEB-INF/src/org/adempiere/webui/window/AboutWindow.java
index 97ded705ed..e3429b3c4f 100644
--- a/zkwebui/WEB-INF/src/org/adempiere/webui/window/AboutWindow.java
+++ b/zkwebui/WEB-INF/src/org/adempiere/webui/window/AboutWindow.java
@@ -29,10 +29,8 @@ import org.adempiere.webui.component.Tabpanels;
 import org.adempiere.webui.component.Tabs;
 import org.adempiere.webui.component.ToolBarButton;
 import org.adempiere.webui.component.Window;
-import org.adempiere.webui.theme.ITheme;
 import org.adempiere.webui.theme.ThemeManager;
 import org.compiere.Adempiere;
-import org.compiere.model.MSysConfig;
 import org.compiere.model.MUser;
 import org.compiere.util.CLogErrorBuffer;
 import org.compiere.util.CLogMgt;