diff --git a/base/src/org/adempiere/process/rpl/exp/ExportHelper.java b/base/src/org/adempiere/process/rpl/exp/ExportHelper.java
index 63e84cd277..875d79a496 100644
--- a/base/src/org/adempiere/process/rpl/exp/ExportHelper.java
+++ b/base/src/org/adempiere/process/rpl/exp/ExportHelper.java
@@ -26,7 +26,7 @@
  *                                                                    *
  * Sponsors:                                                          *
  *  - E-evolution (http://www.e-evolution.com/)                       *
- **********************************************************************/
+ *********************************************************************/
 package org.adempiere.process.rpl.exp;
 
 import java.sql.SQLException;
@@ -54,8 +54,6 @@ import org.compiere.model.Query;
 import org.compiere.model.X_EXP_FormatLine;
 import org.compiere.util.CLogger;
 import org.compiere.util.DisplayType;
-import org.compiere.util.Env;
-import org.compiere.util.Language;
 import org.compiere.util.Msg;
 import org.compiere.util.Trx;
 import org.w3c.dom.Document;
@@ -96,15 +94,10 @@ public class ExportHelper {
 	public ExportHelper(MClient client, MReplicationStrategy rplStrategy) {
 		m_AD_Client_ID = client.getAD_Client_ID();
 		m_rplStrategy = rplStrategy;
-		
-		DisplayType.getDateFormat(DisplayType.DateTime, Language.getLanguage(Env.getAD_Language(client.getCtx())));
-		DisplayType.getDateFormat(DisplayType.Date, Language.getLanguage(Env.getAD_Language(client.getCtx())));
 	}
 	
 	public ExportHelper(Properties ctx , int AD_Client_ID) {
 		m_AD_Client_ID = AD_Client_ID;
-		DisplayType.getDateFormat(DisplayType.DateTime, Language.getLanguage(Env.getAD_Language(ctx)));
-		DisplayType.getDateFormat(DisplayType.Date, Language.getLanguage(Env.getAD_Language(ctx)));
 	}
 	
 		/**
diff --git a/base/src/org/adempiere/process/rpl/imp/ImportHelper.java b/base/src/org/adempiere/process/rpl/imp/ImportHelper.java
index cf33b1adb7..29b96dd70e 100755
--- a/base/src/org/adempiere/process/rpl/imp/ImportHelper.java
+++ b/base/src/org/adempiere/process/rpl/imp/ImportHelper.java
@@ -25,7 +25,7 @@
  *                                                                    *
  * Sponsors:                                                          *
  *  - E-evolution (http://www.e-evolution.com/)                       *
- **********************************************************************/
+ *********************************************************************/
 package org.adempiere.process.rpl.imp;
 
 import java.math.BigDecimal;
@@ -83,12 +83,6 @@ public class ImportHelper {
 	/** Static Logger 				*/
 	private static CLogger s_log = CLogger.getCLogger(ImportHelper.class);
 	
-	/** Date Time Format			*/
-	private SimpleDateFormat	m_dateTimeFormat = null;
-
-	/** Date Format					*/
-	private SimpleDateFormat	m_dateFormat = null;
-	
 	/** Custom Date Format			*/
 	private SimpleDateFormat	m_customDateFormat = null;
 	
@@ -98,9 +92,6 @@ public class ImportHelper {
 	public ImportHelper(Properties ctx) 
 	{
 		this.ctx = ctx;
-		// Construct DateFromat and DateTimeFormat
-		m_dateTimeFormat = DisplayType.getDateFormat(DisplayType.DateTime, Env.getLanguage(ctx));
-		m_dateFormat 	 = DisplayType.getDateFormat(DisplayType.Date, Env.getLanguage(ctx));
 	}
 	
 	/**
@@ -240,7 +231,6 @@ public class ImportHelper {
 	 * @throws Exception
 	 * @throws XPathExpressionException
 	 */
-	@SuppressWarnings("unchecked")
 	private PO importElement(Properties ctx, StringBuffer result, Element rootElement,
 			MEXPFormat expFormat, String ReplicationType, String trxName) throws Exception, XPathExpressionException 
 	{
@@ -404,7 +394,7 @@ public class ImportHelper {
 			{
 				
 				// Clazz
-				Class clazz = DisplayType.getClass(column.getAD_Reference_ID(), true);
+				Class<?> clazz = DisplayType.getClass(column.getAD_Reference_ID(), true);
 				
 				//	Handle Posted
 				if (column.getColumnName().equalsIgnoreCase("Posted") 
diff --git a/base/src/org/eevolution/process/ExportFormatGenerator.java b/base/src/org/eevolution/process/ExportFormatGenerator.java
index fb00d16f74..f56077e1ae 100644
--- a/base/src/org/eevolution/process/ExportFormatGenerator.java
+++ b/base/src/org/eevolution/process/ExportFormatGenerator.java
@@ -46,7 +46,7 @@ public class ExportFormatGenerator extends SvrProcess
 	private int			p_AD_Window_ID = 0;
 	private boolean     p_IsMandatory = false;
 	private boolean     p_IsInsertRecord= false;
-	private Hashtable m_formats = new Hashtable();
+	private Hashtable<String, MEXPFormat> m_formats = new Hashtable<String, MEXPFormat>();
 	private String version = "3.2.0";
 	private String m_parent_table = null;
 	private String m_format_value = null;