diff --git a/activemq-optional/src/main/java/org/activemq/axis/ActiveMQVendorAdapter.java b/activemq-optional/src/main/java/org/activemq/axis/ActiveMQVendorAdapter.java
index 2fae9e26e5..4e3482170d 100755
--- a/activemq-optional/src/main/java/org/activemq/axis/ActiveMQVendorAdapter.java
+++ b/activemq-optional/src/main/java/org/activemq/axis/ActiveMQVendorAdapter.java
@@ -52,11 +52,6 @@ public class ActiveMQVendorAdapter extends BeanVendorAdapter {
      */
     public final static String DEFAULT_PASSWORD = "defaultPassword";
 
-    /**
-     * Specifies whether the broker is embedded
-     */
-    public final static String EMBEDDED_BROKER = "embeddedBroker";
-
 
     public QueueConnectionFactory getQueueConnectionFactory(HashMap properties)
             throws Exception {
@@ -84,14 +79,10 @@ public class ActiveMQVendorAdapter extends BeanVendorAdapter {
         if (jmsUrl.getPropertyValue(DEFAULT_PASSWORD) != null) {
             properties.put(DEFAULT_PASSWORD, jmsUrl.getPropertyValue(DEFAULT_PASSWORD));
         }
-        if (jmsUrl.getPropertyValue(EMBEDDED_BROKER) != null) {
-            properties.put(EMBEDDED_BROKER, jmsUrl.getPropertyValue(EMBEDDED_BROKER));
-        }
     }
 
     public boolean isMatchingConnectionFactory(ConnectionFactory connectionFactory, JMSURLHelper jmsURL, HashMap properties) {
         String brokerURL = null;
-        boolean embeddedBroker = false;
 
         if (connectionFactory instanceof ActiveMQConnectionFactory) {
             ActiveMQConnectionFactory amqConnectionFactory =
@@ -99,7 +90,6 @@ public class ActiveMQVendorAdapter extends BeanVendorAdapter {
 
             // get existing queue connection factory properties
             brokerURL = amqConnectionFactory.getBrokerURL();
-            embeddedBroker = amqConnectionFactory.isUseEmbeddedBroker();
         }
 
         // compare broker url
@@ -107,16 +97,6 @@ public class ActiveMQVendorAdapter extends BeanVendorAdapter {
         if (!brokerURL.equals(propertyBrokerURL)) {
             return false;
         }
-
-        // compare load balancing flag
-        String tmpEmbeddedBroker = (String) properties.get(EMBEDDED_BROKER);
-        boolean propertyEmbeddedBroker = false;
-        if (tmpEmbeddedBroker != null) {
-            propertyEmbeddedBroker = Boolean.valueOf(tmpEmbeddedBroker).booleanValue();
-        }
-        if (embeddedBroker != propertyEmbeddedBroker) {
-            return false;
-        }
         return true;
     }
 }
diff --git a/activemq-optional/src/main/java/org/activemq/benchmark/BenchmarkSupport.java b/activemq-optional/src/main/java/org/activemq/benchmark/BenchmarkSupport.java
index ecf63113dd..11a9c95e3f 100755
--- a/activemq-optional/src/main/java/org/activemq/benchmark/BenchmarkSupport.java
+++ b/activemq-optional/src/main/java/org/activemq/benchmark/BenchmarkSupport.java
@@ -42,7 +42,6 @@ public class BenchmarkSupport {
     protected int connectionCount = 1;
     protected int batch = 1000;
     protected Destination destination;
-    protected boolean embeddedBroker = false;
     private boolean topic = true;
     private boolean durable = false;
 
@@ -112,14 +111,6 @@ public class BenchmarkSupport {
         this.durable = durable;
     }
 
-    public boolean isEmbeddedBroker() {
-        return embeddedBroker;
-    }
-
-    public void setEmbeddedBroker(boolean embeddedBroker) {
-        this.embeddedBroker = embeddedBroker;
-    }
-
     public int getConnectionCount() {
         return connectionCount;
     }
@@ -148,9 +139,6 @@ public class BenchmarkSupport {
 
     protected ActiveMQConnectionFactory createFactory() {
         ActiveMQConnectionFactory answer = new ActiveMQConnectionFactory(getUrl());
-        if (embeddedBroker) {
-            answer.setUseEmbeddedBroker(true);
-        }
         return answer;
     }