diff --git a/activemq-optional/pom.xml b/activemq-optional/pom.xml
index 551e21fe1b..bb95dd093b 100755
--- a/activemq-optional/pom.xml
+++ b/activemq-optional/pom.xml
@@ -36,15 +36,15 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>activemq-core</artifactId>
     </dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>slf4j-api</artifactId>
-	</dependency>
-	<dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>activemq-core</artifactId>
       <type>test-jar</type>
-	  <scope>test</scope>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -88,11 +88,6 @@
         <artifactId>jetty-websocket</artifactId>
         <version>${jetty-version}</version>
     </dependency>
-    <dependency>
-      <groupId>axis</groupId>
-      <artifactId>axis</artifactId>
-      <optional>true</optional>
-    </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
@@ -110,19 +105,19 @@
       <artifactId>commons-logging</artifactId>
       <scope>test</scope>
     </dependency>
-	<!-- log4j jms appender and test tool needs this -->
-	<dependency>
+    <!-- log4j jms appender and test tool needs this -->
+    <dependency>
       <groupId>log4j</groupId>
-	  <artifactId>log4j</artifactId>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
+      <artifactId>log4j</artifactId>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>compile</scope>
       <optional>true</optional>
-	</dependency>
+    </dependency>
     <dependency>
       <groupId>org.apache.xmlbeans</groupId>
       <artifactId>xmlbeans</artifactId>
diff --git a/activemq-optional/src/main/java/org/apache/activemq/axis/ActiveMQVendorAdapter.java b/activemq-optional/src/main/java/org/apache/activemq/axis/ActiveMQVendorAdapter.java
deleted file mode 100755
index 472b90afbc..0000000000
--- a/activemq-optional/src/main/java/org/apache/activemq/axis/ActiveMQVendorAdapter.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.axis;
-
-import java.util.HashMap;
-import javax.jms.ConnectionFactory;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.TopicConnectionFactory;
-
-import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.axis.components.jms.BeanVendorAdapter;
-import org.apache.axis.transport.jms.JMSURLHelper;
-
-/**
- * An adapter for using ActiveMQ inside <a
- * href="http://ws.apache.org/axis/">Apache Axis</a>
- * 
- * @deprecated will be removed from ActiveMQ 5.8 onwards.
- */
-@Deprecated
-public class ActiveMQVendorAdapter extends BeanVendorAdapter {
-
-    /**
-     * The URL to connect to the broker
-     */
-    public static final String BROKER_URL = "brokerURL";
-
-    /**
-     * Specifies the default user name
-     */
-    public static final String DEFAULT_USERNAME = "defaultUser";
-
-    /**
-     * Specifies the default password
-     */
-    public static final String DEFAULT_PASSWORD = "defaultPassword";
-
-    protected static final String QCF_CLASS = ActiveMQConnectionFactory.class.getName();
-    protected static final String TCF_CLASS = QCF_CLASS;
-
-
-    public QueueConnectionFactory getQueueConnectionFactory(HashMap properties) throws Exception {
-        properties = (HashMap)properties.clone();
-        properties.put(CONNECTION_FACTORY_CLASS, QCF_CLASS);
-        return super.getQueueConnectionFactory(properties);
-    }
-
-    public TopicConnectionFactory getTopicConnectionFactory(HashMap properties) throws Exception {
-        properties = (HashMap)properties.clone();
-        properties.put(CONNECTION_FACTORY_CLASS, TCF_CLASS);
-        return super.getTopicConnectionFactory(properties);
-    }
-
-    public void addVendorConnectionFactoryProperties(JMSURLHelper jmsUrl, HashMap properties) {
-        if (jmsUrl.getPropertyValue(BROKER_URL) != null) {
-            properties.put(BROKER_URL, jmsUrl.getPropertyValue(BROKER_URL));
-        }
-
-        if (jmsUrl.getPropertyValue(DEFAULT_USERNAME) != null) {
-            properties.put(DEFAULT_USERNAME, jmsUrl.getPropertyValue(DEFAULT_USERNAME));
-        }
-        if (jmsUrl.getPropertyValue(DEFAULT_PASSWORD) != null) {
-            properties.put(DEFAULT_PASSWORD, jmsUrl.getPropertyValue(DEFAULT_PASSWORD));
-        }
-    }
-
-    public boolean isMatchingConnectionFactory(ConnectionFactory connectionFactory, JMSURLHelper jmsURL, HashMap properties) {
-        String brokerURL = null;
-
-        if (connectionFactory instanceof ActiveMQConnectionFactory) {
-            ActiveMQConnectionFactory amqConnectionFactory = (ActiveMQConnectionFactory)connectionFactory;
-
-            // get existing queue connection factory properties
-            brokerURL = amqConnectionFactory.getBrokerURL();
-        }
-
-        // compare broker url
-        String propertyBrokerURL = (String)properties.get(BROKER_URL);
-        if (brokerURL == null || !brokerURL.equals(propertyBrokerURL)) {
-            return false;
-        }
-        return true;
-    }
-}
diff --git a/activemq-optional/src/main/java/org/apache/activemq/axis/package.html b/activemq-optional/src/main/java/org/apache/activemq/axis/package.html
deleted file mode 100755
index 8067d74019..0000000000
--- a/activemq-optional/src/main/java/org/apache/activemq/axis/package.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-   
-    http://www.apache.org/licenses/LICENSE-2.0
-   
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<html>
-<head>
-</head>
-<body>
-
-	Support classes for integration with <a href="http://ws.apache.org/axis/">Apache Axis</a>
-	for web service integration
-
-</body>
-</html>
diff --git a/activemq-optional/src/test/resources/org/activemq/axis/activemq-connection-factory.properties b/activemq-optional/src/test/resources/org/activemq/axis/activemq-connection-factory.properties
deleted file mode 100755
index 5ee6cb95a9..0000000000
--- a/activemq-optional/src/test/resources/org/activemq/axis/activemq-connection-factory.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-## 
-## http://www.apache.org/licenses/LICENSE-2.0
-## 
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-
-#
-# An example config file for using ActiveMQ with Apache Axis
-#
-
-brokerURL=tcp://localhost:61616
-defaultUser=Administrator
-defaultPassword=Administrator