diff --git a/sqlj/src/org/compiere/sqlj/Adempiere.java b/sqlj/src/org/compiere/sqlj/Adempiere.java
index 61ee482831..e6aec3a764 100644
--- a/sqlj/src/org/compiere/sqlj/Adempiere.java
+++ b/sqlj/src/org/compiere/sqlj/Adempiere.java
@@ -73,13 +73,8 @@ public class Adempiere implements Serializable
 
 	/** Oracle Server					*/
 	public static final String TYPE_ORACLE = "oracle";
-	/** Derby Server					*/
-	public static final String TYPE_DERBY = "derby";
-    //begin e-evolution vpj-cd 02/02/2005 PostgreSQL
 	/** PostgreSQL **/
 	public static final String TYPE_POSTGRESQL = "PostgreSQL";
-        public static final String TYPE_EDB = "EDB";
-	//end e-evolution vpj-cd 02/02/2005 PostgreSQL	
 	/** Server Type						*/        
 	public static String 	s_type = null;
 	
@@ -94,8 +89,6 @@ public class Adempiere implements Serializable
 			String vendor = System.getProperty("java.vendor");
 			if (vendor.startsWith("Oracle"))
 				s_type = TYPE_ORACLE;
-			else if (vendor.startsWith("Derby"))
-				s_type = TYPE_DERBY;
 			else
 				s_type = "??";
 		}
@@ -115,20 +108,8 @@ public class Adempiere implements Serializable
 		return false;
 	}	//	isOracle
 	
-	/**
-	 * 	Is this Derby ?
-	 *	@return true if Derby
-	 */
-	static boolean isDerby()
-	{
-		if (s_type == null)
-			getServerType();
-		if (s_type != null)
-			return TYPE_DERBY.equals(s_type);
-		return false;
-	}	//	isDerby
         
-                    //begin vpj-cd e-evolution 02/22/2005 PostgreSQL
+    //begin vpj-cd e-evolution 02/22/2005 PostgreSQL
 	/**
 	 * 	Is this PostgreSQL ?
 	 *	@return true if PostgreSQL
diff --git a/sqlj/src/org/compiere/sqlj/Compiere.java b/sqlj/src/org/compiere/sqlj/Compiere.java
index d67efe59f6..c5ef7bf89e 100755
--- a/sqlj/src/org/compiere/sqlj/Compiere.java
+++ b/sqlj/src/org/compiere/sqlj/Compiere.java
@@ -73,13 +73,10 @@ public class Compiere implements Serializable
 
 	/** Oracle Server					*/
 	public static final String TYPE_ORACLE = "oracle";
-	/** Derby Server					*/
-	public static final String TYPE_DERBY = "derby";
         
 	//begin e-evolution vpj-cd 02/02/2005 PostgreSQL
 	/** PostgreSQL **/
 	public static final String TYPE_POSTGRESQL = "PostgreSQL";
-    public static final String TYPE_EDB = "EDB";
 	//end e-evolution vpj-cd 02/02/2005 PostgreSQL	
         
 	/** Server Type						*/
@@ -96,8 +93,6 @@ public class Compiere implements Serializable
 			String vendor = System.getProperty("java.vendor");
 			if (vendor.startsWith("Oracle"))
 				s_type = TYPE_ORACLE;
-			else if (vendor.startsWith("Derby"))
-				s_type = TYPE_DERBY;
 			else
 				s_type = "??";
 		}
@@ -117,20 +112,7 @@ public class Compiere implements Serializable
 		return false;
 	}	//	isOracle
 	
-	/**
-	 * 	Is this Derby ?
-	 *	@return true if Derby
-	 */
-	static boolean isDerby()
-	{
-		if (s_type == null)
-			getServerType();
-		if (s_type != null)
-			return TYPE_DERBY.equals(s_type);
-		return false;
-	}	//	isDerby
-	
-                    //begin vpj-cd e-evolution 02/22/2005 PostgreSQL
+    //begin vpj-cd e-evolution 02/22/2005 PostgreSQL
 	/**
 	 * 	Is this PostgreSQL ?
 	 *	@return true if PostgreSQL
@@ -143,16 +125,8 @@ public class Compiere implements Serializable
 			return TYPE_POSTGRESQL.equals(s_type);
 		return false;
 	}	
-        //	isEDB
-        	static boolean isEDB()
-	{
-		if (s_type == null)
-			getServerType();
-		if (s_type != null)
-			return TYPE_EDB.equals(s_type);
-		return false;
-	}	//	isEDB
 	//end vpj-cd e-evolution 02/22/2005 PostgreSQL
+	
 	/**
 	 * 	Get Connection URL
 	 *	@return connection URL
@@ -164,13 +138,8 @@ public class Compiere implements Serializable
 		
 		if (isOracle())
 			s_url = "jdbc:default:connection:";
-		else if (isDerby())
-			s_url = "jdbc:default:connection";
-                    //begin vpj-cd e-evolution 02/22/2005 PostgreSQL
 		else if (isPostgreSQL())
 			return "jdbc:default:connection";
-                else if (isEDB())
-			return "jdbc:default:connection";
 		return "jdbc:default:connection";
 		//
 		//return s_url;