diff --git a/org.adempiere.base.process/src/org/compiere/process/BOMFlagValidate.java b/org.adempiere.base.process/src/org/compiere/process/BOMFlagValidate.java
index 68afc6ce69..d1ac83e307 100644
--- a/org.adempiere.base.process/src/org/compiere/process/BOMFlagValidate.java
+++ b/org.adempiere.base.process/src/org/compiere/process/BOMFlagValidate.java
@@ -6,7 +6,6 @@ import java.sql.SQLException;
 import java.util.logging.Level;
 
 import org.compiere.model.MProduct;
-import org.compiere.process.SvrProcess;
 import org.compiere.util.DB;
 import org.compiere.util.Env;
 
diff --git a/org.adempiere.base.process/src/org/compiere/process/BOMVerify.java b/org.adempiere.base.process/src/org/compiere/process/BOMVerify.java
index 28e65bc771..7f7436296c 100644
--- a/org.adempiere.base.process/src/org/compiere/process/BOMVerify.java
+++ b/org.adempiere.base.process/src/org/compiere/process/BOMVerify.java
@@ -20,7 +20,6 @@ import java.sql.*;
 import java.util.*;
 import java.util.logging.*;
 import org.compiere.model.*;
-import org.compiere.process.SvrProcess;
 import org.compiere.util.*;
 
 /**
diff --git a/org.adempiere.base/src/org/adempiere/exceptions/PORelationException.java b/org.adempiere.base/src/org/adempiere/exceptions/PORelationException.java
index 5dfcb7e371..d07f98cab0 100644
--- a/org.adempiere.base/src/org/adempiere/exceptions/PORelationException.java
+++ b/org.adempiere.base/src/org/adempiere/exceptions/PORelationException.java
@@ -15,7 +15,6 @@ package org.adempiere.exceptions;
 
 import java.util.logging.Level;
 
-import org.adempiere.exceptions.AdempiereException;
 import org.compiere.model.PO;
 import org.compiere.util.CLogger;
 import org.compiere.util.Msg;
diff --git a/org.adempiere.base/src/org/adempiere/pdf/Document.java b/org.adempiere.base/src/org/adempiere/pdf/Document.java
index 8f875be188..b3c458f3b3 100644
--- a/org.adempiere.base/src/org/adempiere/pdf/Document.java
+++ b/org.adempiere.base/src/org/adempiere/pdf/Document.java
@@ -27,6 +27,7 @@ import org.compiere.model.MSysConfig;
 import com.itextpdf.text.FontFactory;
 import com.itextpdf.text.Rectangle;
 import com.itextpdf.awt.DefaultFontMapper;
+import com.itextpdf.awt.PdfGraphics2D;
 import com.itextpdf.text.pdf.PdfContentByte;
 import com.itextpdf.text.pdf.PdfTemplate;
 import com.itextpdf.text.pdf.PdfWriter;
@@ -76,7 +77,7 @@ public class Document {
             	}
             	
 	            PdfTemplate tp = cb.createTemplate(w, h);
-	            Graphics2D g2 = tp.createGraphics(w, h, mapper);
+	            Graphics2D g2 = new PdfGraphics2D(tp, w, h, mapper);
 	            tp.setWidth(w);
 	            tp.setHeight(h);
 	            pageable.getPrintable(page).print(g2, pf, page);
diff --git a/org.adempiere.base/src/org/compiere/acct/Doc_AllocationHdr.java b/org.adempiere.base/src/org/compiere/acct/Doc_AllocationHdr.java
index f6b62dd51f..6101c654d3 100644
--- a/org.adempiere.base/src/org/compiere/acct/Doc_AllocationHdr.java
+++ b/org.adempiere.base/src/org/compiere/acct/Doc_AllocationHdr.java
@@ -723,26 +723,6 @@ public class Doc_AllocationHdr extends Doc
 	}	//	getCashAcct
 
 
-	/**************************************************************************
-	 * 	Create Realized Gain & Loss.
-	 * 	Compares the Accounted Amount of the Invoice to the
-	 * 	Accounted Amount of the Allocation
-	 *	@param as accounting schema
-	 *	@param fact fact
-	 *	@param acct account
-	 *	@param invoice invoice
-	 *	@param allocationSource source amt
-	 *	@param allocationAccounted acct amt
-	 *	@return Error Message or null if OK
-	 *
-	 */
-	private String createRealizedGainLoss (DocLine line, MAcctSchema as, Fact fact, MAccount acct,
-		MInvoice invoice, BigDecimal allocationSource, BigDecimal allocationAccounted)
-	{
-		return createInvoiceGainLoss(line, as, fact, acct, invoice, allocationSource, allocationAccounted);
-	}	//	createRealizedGainLoss
-
-
 	/**************************************************************************
 	 * 	Create Tax Correction.
 	 * 	Requirement: Adjust the tax amount, if you did not receive the full
diff --git a/org.adempiere.base/src/org/compiere/db/TestEJB.java b/org.adempiere.base/src/org/compiere/db/TestEJB.java
index c631a2a4f0..c022399ba2 100644
--- a/org.adempiere.base/src/org/compiere/db/TestEJB.java
+++ b/org.adempiere.base/src/org/compiere/db/TestEJB.java
@@ -36,7 +36,7 @@ public class TestEJB
 	 */
 	public TestEJB ()
 	{
-		CConnection cc = CConnection.get(null);
+		CConnection cc = CConnection.get();
 		cc.setAppsHost("dev1");
 		InitialContext ic = cc.getInitialContext(false);
 		/**/
diff --git a/org.adempiere.base/src/org/compiere/model/MProductionLineMA.java b/org.adempiere.base/src/org/compiere/model/MProductionLineMA.java
index 4786cfb80f..918591c343 100644
--- a/org.adempiere.base/src/org/compiere/model/MProductionLineMA.java
+++ b/org.adempiere.base/src/org/compiere/model/MProductionLineMA.java
@@ -7,7 +7,6 @@ import java.util.Date;
 import java.util.List;
 import java.util.Properties;
 
-import org.compiere.model.X_M_ProductionLineMA;
 import org.compiere.util.Env;
 import org.compiere.util.Util;
 
diff --git a/org.adempiere.base/src/org/compiere/model/SalesMgmtValidator.java b/org.adempiere.base/src/org/compiere/model/SalesMgmtValidator.java
index 5684b83782..19642c6fb4 100644
--- a/org.adempiere.base/src/org/compiere/model/SalesMgmtValidator.java
+++ b/org.adempiere.base/src/org/compiere/model/SalesMgmtValidator.java
@@ -17,7 +17,6 @@
 
 package org.compiere.model;
 
-import org.compiere.model.ModelValidator;
 import org.compiere.util.CLogger;
 
 
diff --git a/org.adempiere.base/src/org/compiere/process/PosKeyGenerate.java b/org.adempiere.base/src/org/compiere/process/PosKeyGenerate.java
index 14f2aefcda..a8a4dfa747 100644
--- a/org.adempiere.base/src/org/compiere/process/PosKeyGenerate.java
+++ b/org.adempiere.base/src/org/compiere/process/PosKeyGenerate.java
@@ -23,7 +23,6 @@ import org.adempiere.exceptions.FillMandatoryException;
 import org.compiere.model.MPOSKey;
 import org.compiere.model.MProduct;
 import org.compiere.model.Query;
-import org.compiere.process.SvrProcess;
 import org.compiere.util.Env;
 
 
diff --git a/org.adempiere.replication.server/src/org/compiere/server/ReplicationProcessor.java b/org.adempiere.replication.server/src/org/compiere/server/ReplicationProcessor.java
index 650bbee04b..2e7e714dea 100644
--- a/org.adempiere.replication.server/src/org/compiere/server/ReplicationProcessor.java
+++ b/org.adempiere.replication.server/src/org/compiere/server/ReplicationProcessor.java
@@ -38,7 +38,6 @@ import org.compiere.model.MOrgInfo;
 import org.compiere.model.X_IMP_Processor_Type;
 import org.compiere.util.Env;
 import org.compiere.util.TimeUtil;
-import org.compiere.server.AdempiereServer;
 import org.compiere.model.MIMPProcessor;
 import org.compiere.model.MIMPProcessorLog;
 
diff --git a/org.idempiere.zk.extra/src/org/zkoss/zul/impl/CustomGridDataLoader.java b/org.idempiere.zk.extra/src/org/zkoss/zul/impl/CustomGridDataLoader.java
index 0b94c249c5..b3633c0f19 100644
--- a/org.idempiere.zk.extra/src/org/zkoss/zul/impl/CustomGridDataLoader.java
+++ b/org.idempiere.zk.extra/src/org/zkoss/zul/impl/CustomGridDataLoader.java
@@ -13,7 +13,6 @@
 package org.zkoss.zul.impl;
 
 import org.zkoss.lang.Library;
-import org.zkoss.zul.impl.GridDataLoader;
 
 /**
  * @author hengsin