diff --git a/base/src/org/compiere/model/MRule.java b/base/src/org/compiere/model/MRule.java
index cb81914e87..72d1180b8e 100644
--- a/base/src/org/compiere/model/MRule.java
+++ b/base/src/org/compiere/model/MRule.java
@@ -17,21 +17,17 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.PreparedStatement;
 import java.sql.ResultSet;
-import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Properties;
-import java.util.logging.Level;
 
 import javax.script.ScriptEngine;
 import javax.script.ScriptEngineManager;
 
 import org.compiere.util.CCache;
 import org.compiere.util.CLogger;
-import org.compiere.util.DB;
 import org.compiere.util.Msg;
 import org.compiere.util.Util;
 
@@ -45,7 +41,8 @@ public class MRule extends X_AD_Rule
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = 343261652226641676L;
+	private static final long serialVersionUID = -9166262780531877045L;
+	
 	//global or login context variable prefix
 	public final static String GLOBAL_CONTEXT_PREFIX = "G_";
 	//window context variable prefix
@@ -85,7 +82,7 @@ public class MRule extends X_AD_Rule
 	{
 		if (ruleValue == null)
 			return null;
-		Iterator it = s_cache.values().iterator();
+		Iterator<MRule> it = s_cache.values().iterator();
 		while (it.hasNext())
 		{
 			MRule retValue = (MRule)it.next();
@@ -112,15 +109,13 @@ public class MRule extends X_AD_Rule
 	 *	@param ctx context
 	 *	@return Rule
 	 */
-	public static ArrayList<MRule> getModelValidatorLoginRules (Properties ctx)
+	public static List<MRule> getModelValidatorLoginRules (Properties ctx)
 	{
 		final String whereClause = "EventType=?";
-		List<MRule>list = new Query(ctx,I_AD_Rule.Table_Name,whereClause,null)
+		List<MRule> rules = new Query(ctx,I_AD_Rule.Table_Name,whereClause,null)
 		.setParameters(EVENTTYPE_ModelValidatorLoginEvent)
 		.setOnlyActiveRecords(true)
 		.list();
-		ArrayList<MRule> rules = new ArrayList<MRule>();
-		rules.addAll(list);
 		if (rules != null && rules.size() > 0)
 			return rules;
 		else
diff --git a/base/src/org/compiere/model/ModelValidationEngine.java b/base/src/org/compiere/model/ModelValidationEngine.java
index 248af24f4b..eb03c4be62 100644
--- a/base/src/org/compiere/model/ModelValidationEngine.java
+++ b/base/src/org/compiere/model/ModelValidationEngine.java
@@ -215,7 +215,7 @@ public class ModelValidationEngine
 		}
 		
 		// now process the script model validator login
-		ArrayList<MRule> loginRules = MRule.getModelValidatorLoginRules (Env.getCtx());
+		List<MRule> loginRules = MRule.getModelValidatorLoginRules (Env.getCtx());
 		if (loginRules != null) {
 			for (MRule loginRule : loginRules) {
 				// currently just JSR 223 supported
diff --git a/extend/src/test/functional/MRuleTest.java b/extend/src/test/functional/MRuleTest.java
index 6c5e0c527d..115a87de74 100644
--- a/extend/src/test/functional/MRuleTest.java
+++ b/extend/src/test/functional/MRuleTest.java
@@ -13,7 +13,7 @@
  *****************************************************************************/
 package test.functional;
 
-import java.util.ArrayList;
+import java.util.List;
 
 import org.compiere.model.MRule;
 import org.compiere.util.Env;
@@ -38,7 +38,7 @@ public class MRuleTest extends AdempiereTestCase
 	{
 		MRule getrule = MRule.get(getCtx(), "beanshell:getAvailable");
 		assertTrue("BeanRule must be exact", getrule.getAD_Rule_ID()==1000000);
-		ArrayList<MRule> rules = MRule.getModelValidatorLoginRules(getCtx());
+		List<MRule> rules = MRule.getModelValidatorLoginRules(getCtx());
 		assertTrue("Rules has array", rules.size() > 0); //red1 set in DB Rule.EventType = L before testing
 
 	}