diff --git a/activemq-optional/src/main/java/org/apache/activemq/benchmark/BenchmarkSupport.java b/activemq-optional/src/main/java/org/apache/activemq/benchmark/BenchmarkSupport.java
index 2ce7cbf5b2..449e5f6183 100755
--- a/activemq-optional/src/main/java/org/apache/activemq/benchmark/BenchmarkSupport.java
+++ b/activemq-optional/src/main/java/org/apache/activemq/benchmark/BenchmarkSupport.java
@@ -31,9 +31,6 @@ import org.apache.activemq.util.IdGenerator;
/**
* Abstract base class for some simple benchmark tools
- *
- * @author James Strachan
- *
*/
public class BenchmarkSupport {
diff --git a/activemq-optional/src/main/java/org/apache/activemq/benchmark/Consumer.java b/activemq-optional/src/main/java/org/apache/activemq/benchmark/Consumer.java
index c213b71b90..5d5ae7c9c8 100755
--- a/activemq-optional/src/main/java/org/apache/activemq/benchmark/Consumer.java
+++ b/activemq-optional/src/main/java/org/apache/activemq/benchmark/Consumer.java
@@ -25,10 +25,6 @@ import javax.jms.Session;
import javax.jms.TextMessage;
import javax.jms.Topic;
-/**
- * @author James Strachan
- *
- */
public class Consumer extends BenchmarkSupport implements MessageListener {
public Consumer() {
diff --git a/activemq-optional/src/main/java/org/apache/activemq/benchmark/Producer.java b/activemq-optional/src/main/java/org/apache/activemq/benchmark/Producer.java
index 15e621db8c..9923a88e02 100755
--- a/activemq-optional/src/main/java/org/apache/activemq/benchmark/Producer.java
+++ b/activemq-optional/src/main/java/org/apache/activemq/benchmark/Producer.java
@@ -28,10 +28,6 @@ import javax.jms.Message;
import javax.jms.MessageProducer;
import javax.jms.Session;
-/**
- * @author James Strachan
- *
- */
public class Producer extends BenchmarkSupport {
int loops = -1;
diff --git a/activemq-optional/src/main/java/org/apache/activemq/benchmark/ProducerConsumer.java b/activemq-optional/src/main/java/org/apache/activemq/benchmark/ProducerConsumer.java
index 3dc099cf2e..32489e9c87 100755
--- a/activemq-optional/src/main/java/org/apache/activemq/benchmark/ProducerConsumer.java
+++ b/activemq-optional/src/main/java/org/apache/activemq/benchmark/ProducerConsumer.java
@@ -16,10 +16,6 @@
*/
package org.apache.activemq.benchmark;
-/**
- * @author James Strachan
- *
- */
public class ProducerConsumer extends Producer {
private Consumer consumer = new Consumer();
diff --git a/activemq-optional/src/main/java/org/apache/activemq/store/amq/AMQJournalTool.java b/activemq-optional/src/main/java/org/apache/activemq/store/amq/AMQJournalTool.java
index 736d012007..5fdfa2bf82 100644
--- a/activemq-optional/src/main/java/org/apache/activemq/store/amq/AMQJournalTool.java
+++ b/activemq-optional/src/main/java/org/apache/activemq/store/amq/AMQJournalTool.java
@@ -53,8 +53,6 @@ import org.josql.Query;
/**
* Allows you to view the contents of a Journal.
- *
- * @author Hiram Chirino
*/
public class AMQJournalTool {
diff --git a/activemq-optional/src/main/java/org/apache/activemq/store/amq/CommandLineSupport.java b/activemq-optional/src/main/java/org/apache/activemq/store/amq/CommandLineSupport.java
index bffba306fb..44a1486270 100644
--- a/activemq-optional/src/main/java/org/apache/activemq/store/amq/CommandLineSupport.java
+++ b/activemq-optional/src/main/java/org/apache/activemq/store/amq/CommandLineSupport.java
@@ -23,8 +23,6 @@ import org.apache.activemq.util.IntrospectionSupport;
/**
* Helper utility that can be used to set the properties on any object using
* command line arguments.
- *
- * @author Hiram Chirino
*/
public final class CommandLineSupport {
@@ -43,10 +41,10 @@ public final class CommandLineSupport {
* target.setPersistent(true);
*
* Notice the the proper conversion for the argument is determined by examining the
- * setter arguement type.
+ * setter argument type.
*
* @param target the object that will have it's properties set
- * @param args the commline options
+ * @param args the command line options
* @return any arguments that are not valid options for the target
*/
public static String[] setOptions(Object target, String[] args) {
@@ -95,9 +93,6 @@ public final class CommandLineSupport {
/**
* converts strings like: test-enabled to testEnabled
- *
- * @param name
- * @return
*/
private static String convertOptionToPropertyName(String name) {
String rc = "";
diff --git a/activemq-optional/src/main/java/org/apache/activemq/transport/http/BlockingQueueTransport.java b/activemq-optional/src/main/java/org/apache/activemq/transport/http/BlockingQueueTransport.java
index ee826fde46..4132c7ce48 100755
--- a/activemq-optional/src/main/java/org/apache/activemq/transport/http/BlockingQueueTransport.java
+++ b/activemq-optional/src/main/java/org/apache/activemq/transport/http/BlockingQueueTransport.java
@@ -31,7 +31,7 @@ import org.apache.activemq.util.ServiceStopper;
*
*
*/
-public class BlockingQueueTransport extends TransportSupport {
+public class BlockingQueueTransport extends TransportSupport {
public static final long MAX_TIMEOUT = 30000L;
private BlockingQueue