diff --git a/serverApps/src/main/servlet/org/compiere/www/WReport.java b/serverApps/src/main/servlet/org/compiere/www/WReport.java
index f3ef4f2b70..cadb764239 100644
--- a/serverApps/src/main/servlet/org/compiere/www/WReport.java
+++ b/serverApps/src/main/servlet/org/compiere/www/WReport.java
@@ -16,35 +16,37 @@
  *****************************************************************************/
 package org.compiere.www;
 
-import java.awt.Cursor;
-import java.awt.event.ActionEvent;
-import java.io.*;
-import java.net.URLEncoder;
+import java.io.File;
+import java.io.IOException;
 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 javax.servlet.*;
-import javax.servlet.http.*;
-import javax.swing.JComponent;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
-import org.apache.ecs.AlignType;
-import org.apache.ecs.xhtml.a;
-import org.apache.ecs.xhtml.p;
-import org.apache.ecs.xhtml.td;
-import org.compiere.apps.ADialog;
-import org.compiere.apps.AEnv;
-import org.compiere.apps.ProcessCtl;
-import org.compiere.model.*;
-import org.compiere.print.AReport;
+import org.compiere.model.GridField;
+import org.compiere.model.GridTab;
+import org.compiere.model.MQuery;
+import org.compiere.model.MRole;
+import org.compiere.model.PrintInfo;
 import org.compiere.print.MPrintFormat;
 import org.compiere.print.ReportEngine;
-import org.compiere.print.Viewer;
 import org.compiere.process.ProcessInfo;
-import org.compiere.util.*;
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
+import org.compiere.util.KeyNamePair;
+import org.compiere.util.Trx;
+import org.compiere.util.WebDoc;
+import org.compiere.util.WebEnv;
+import org.compiere.util.WebSessionCtx;
+import org.compiere.util.WebUtil;
 
 
 /**