You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2021/11/03 01:45:49 UTC

[activemq-artemis] 02/03: ARTEMIS-3538 Removing a few extra // ----- structural comments

This is an automated email from the ASF dual-hosted git repository.

clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git

commit 8b3663e827c998de4ea9ac13b0c97584579509e4
Author: Clebert Suconic <cl...@apache.org>
AuthorDate: Tue Nov 2 21:45:09 2021 -0400

    ARTEMIS-3538 Removing a few extra // ----- structural comments
---
 .../artemis/cli/commands/tools/xml/XmlDataExporter.java   |  2 --
 .../apache/activemq/artemis/api/core/SimpleString.java    |  3 ---
 .../org/apache/activemq/artemis/utils/RandomUtil.java     | 11 -----------
 .../org/apache/activemq/artemis/utils/UUIDGenerator.java  |  1 -
 .../java/org/apache/activemq/artemis/utils/UUIDTimer.java |  7 -------
 .../artemis/utils/collections/TypedProperties.java        |  4 ----
 .../activemq/artemis/utils/ConcurrentHashSetTest.java     | 10 ----------
 .../artemis/utils/TypedPropertiesConversionTest.java      | 10 ----------
 .../activemq/artemis/utils/TypedPropertiesTest.java       |  2 --
 .../artemis/api/core/management/AddressSettingsInfo.java  |  2 --
 .../artemis/api/core/management/DayCounterInfo.java       |  2 --
 .../artemis/api/core/management/MessageCounterInfo.java   |  2 --
 .../artemis/api/core/management/ObjectNameBuilder.java    |  2 --
 .../artemis/core/client/impl/ClientConsumerImpl.java      | 15 ---------------
 .../artemis/core/client/impl/ClientLargeMessageImpl.java  |  4 ----
 .../artemis/core/client/impl/ClientProducerImpl.java      |  2 --
 .../artemis/core/client/impl/ClientSessionImpl.java       |  3 ---
 .../client/impl/CompressedLargeMessageControllerImpl.java |  2 --
 .../core/client/impl/LargeMessageControllerImpl.java      |  2 --
 .../artemis/core/protocol/core/impl/PacketImpl.java       |  2 --
 .../core/impl/wireformat/ActiveMQExceptionMessage.java    |  2 --
 .../core/impl/wireformat/ActiveMQExceptionMessage_V2.java |  2 --
 .../impl/wireformat/ClusterTopologyChangeMessage.java     |  2 --
 .../core/impl/wireformat/CreateAddressMessage.java        |  2 --
 .../protocol/core/impl/wireformat/CreateQueueMessage.java |  1 -
 .../core/impl/wireformat/CreateQueueMessage_V2.java       |  2 --
 .../core/impl/wireformat/CreateSessionMessage.java        |  2 --
 .../core/impl/wireformat/CreateSessionMessage_V2.java     |  2 --
 .../core/impl/wireformat/CreateSharedQueueMessage.java    |  2 --
 .../protocol/core/impl/wireformat/DisconnectMessage.java  |  2 --
 .../core/impl/wireformat/DisconnectMessage_V2.java        |  2 --
 .../core/impl/wireformat/DisconnectMessage_V3.java        |  2 --
 .../core/impl/wireformat/NullResponseMessage_V2.java      |  2 --
 .../core/impl/wireformat/PacketsConfirmedMessage.java     |  2 --
 .../impl/wireformat/ReattachSessionResponseMessage.java   |  2 --
 .../core/impl/wireformat/SessionAcknowledgeMessage.java   |  2 --
 .../core/impl/wireformat/SessionCloseMessage.java         |  2 --
 .../core/impl/wireformat/SessionConsumerCloseMessage.java |  2 --
 .../impl/wireformat/SessionConsumerFlowCreditMessage.java |  2 --
 .../core/impl/wireformat/SessionContinuationMessage.java  |  2 --
 .../core/impl/wireformat/SessionExpireMessage.java        |  2 --
 .../wireformat/SessionIndividualAcknowledgeMessage.java   |  2 --
 .../wireformat/SessionReceiveContinuationMessage.java     |  4 ----
 .../core/impl/wireformat/SessionReceiveMessage.java       |  2 --
 .../wireformat/SessionRequestProducerCreditsMessage.java  |  2 --
 .../impl/wireformat/SessionSendContinuationMessage.java   |  2 --
 .../wireformat/SessionSendContinuationMessage_V2.java     |  2 --
 .../core/impl/wireformat/SessionSendLargeMessage.java     |  2 --
 .../protocol/core/impl/wireformat/SessionSendMessage.java |  2 --
 .../impl/wireformat/SessionUniqueAddMetaDataMessage.java  | 10 ----------
 .../core/impl/wireformat/SessionXAAfterFailedMessage.java |  2 --
 .../core/impl/wireformat/SessionXAResponseMessage.java    |  2 --
 .../core/impl/wireformat/SessionXAResponseMessage_V2.java |  2 --
 .../core/impl/wireformat/SessionXAResumeMessage.java      |  2 --
 .../core/impl/wireformat/SessionXARollbackMessage.java    |  2 --
 .../core/impl/wireformat/SessionXASetTimeoutMessage.java  |  2 --
 .../wireformat/SessionXASetTimeoutResponseMessage.java    |  2 --
 .../core/impl/wireformat/SessionXAStartMessage.java       |  2 --
 .../SubscribeClusterTopologyUpdatesMessage.java           |  2 --
 .../SubscribeClusterTopologyUpdatesMessageV2.java         |  2 --
 .../artemis/core/remoting/impl/netty/NettyConnector.java  | 11 -----------
 .../artemis/core/remoting/impl/ssl/SSLSupport.java        |  1 -
 .../activemq/artemis/core/transaction/impl/XidImpl.java   |  5 -----
 .../activemq/artemis/utils/ActiveMQBufferInputStream.java | 10 ----------
 .../java/org/apache/activemq/artemis/utils/JNDIUtil.java  | 10 ----------
 .../artemis/utils/ObjectInputStreamWithClassLoader.java   |  9 ---------
 .../apache/activemq/artemis/utils/SizeFormatterUtil.java  | 11 -----------
 .../artemis/utils/SoftValueLongObjectHashMap.java         | 10 ----------
 .../activemq/artemis/utils/TimeAndCounterIDGenerator.java |  8 --------
 .../java/org/apache/activemq/artemis/utils/XMLUtil.java   |  2 --
 .../apache/activemq/artemis/utils/XidCodecSupport.java    | 10 ----------
 .../artemis/util/TimeAndCounterIDGeneratorTest.java       |  2 --
 .../org/apache/activemq/artemis/util/XMLUtilTest.java     |  2 --
 .../activemq/artemis/jms/client/ActiveMQBytesMessage.java |  1 -
 .../activemq/artemis/jms/client/ActiveMQConnection.java   | 11 -----------
 .../artemis/jms/client/ActiveMQConnectionFactory.java     |  5 -----
 .../activemq/artemis/jms/client/ActiveMQDestination.java  |  9 ---------
 .../activemq/artemis/jms/client/ActiveMQMapMessage.java   |  4 ----
 .../activemq/artemis/jms/client/ActiveMQMessage.java      |  6 ------
 .../artemis/jms/client/ActiveMQMessageConsumer.java       |  6 ------
 .../artemis/jms/client/ActiveMQMessageProducer.java       |  1 -
 .../artemis/jms/client/ActiveMQObjectMessage.java         |  1 -
 .../apache/activemq/artemis/jms/client/ActiveMQQueue.java |  7 -------
 .../activemq/artemis/jms/client/ActiveMQQueueBrowser.java |  9 ---------
 .../activemq/artemis/jms/client/ActiveMQSession.java      |  7 -------
 .../artemis/jms/client/ActiveMQStreamMessage.java         |  1 -
 .../artemis/jms/client/ActiveMQTemporaryQueue.java        |  7 -------
 .../artemis/jms/client/ActiveMQTemporaryTopic.java        |  9 ---------
 .../activemq/artemis/jms/client/ActiveMQTextMessage.java  |  1 -
 .../apache/activemq/artemis/jms/client/ActiveMQTopic.java |  7 -------
 .../artemis/jms/bridge/impl/JMSBridgeControlImpl.java     |  9 ---------
 .../activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java   |  6 ------
 .../artemis/jms/persistence/config/PersistedBindings.java |  9 ---------
 .../persistence/config/PersistedConnectionFactory.java    |  9 ---------
 .../jms/persistence/config/PersistedDestination.java      |  9 ---------
 .../impl/journal/JMSJournalStorageManagerImpl.java        |  5 -----
 .../config/impl/ConnectionFactoryConfigurationImpl.java   |  9 ---------
 .../jms/server/config/impl/JMSQueueConfigurationImpl.java |  9 ---------
 .../jms/server/config/impl/TopicConfigurationImpl.java    |  9 ---------
 .../impl/TransportConfigurationEncodingSupport.java       |  9 ---------
 .../artemis/jms/server/impl/JMSServerManagerImpl.java     |  2 --
 .../activemq/artemis/core/io/AbstractSequentialFile.java  |  1 -
 .../activemq/artemis/core/io/aio/AIOSequentialFile.java   |  3 ---
 .../activemq/artemis/core/io/buffer/TimedBuffer.java      |  9 ---------
 .../core/journal/impl/AbstractJournalUpdateTask.java      |  5 -----
 .../artemis/core/journal/impl/JournalFilesRepository.java |  1 -
 .../activemq/artemis/core/journal/impl/JournalImpl.java   |  3 ---
 .../artemis/core/journal/impl/SyncIOCompletion.java       |  9 ---------
 .../core/journal/impl/dataformat/ByteArrayEncoding.java   |  1 -
 .../artemis/core/protocol/stomp/StompProtocolManager.java |  2 --
 .../activemq/artemis/core/protocol/stomp/StompUtils.java  |  9 ---------
 .../org/apache/activemq/artemis/ra/ActiveMQRAService.java |  9 ---------
 .../artemis/core/config/impl/ConfigurationImpl.java       |  2 --
 .../activemq/artemis/core/filter/impl/FilterImpl.java     |  2 --
 .../artemis/core/management/impl/AbstractControl.java     |  5 +----
 .../artemis/core/management/impl/AcceptorControlImpl.java |  9 ---------
 .../core/management/impl/ActiveMQServerControlImpl.java   |  3 ---
 .../artemis/core/management/impl/AddressControlImpl.java  |  3 ---
 .../management/impl/BaseBroadcastGroupControlImpl.java    |  9 ---------
 .../artemis/core/management/impl/BridgeControlImpl.java   |  9 ---------
 .../core/management/impl/BroadcastGroupControlImpl.java   |  9 ---------
 .../management/impl/ClusterConnectionControlImpl.java     |  9 ---------
 .../artemis/core/management/impl/DivertControlImpl.java   |  9 ---------
 .../impl/JGroupsChannelBroadcastGroupControlImpl.java     |  9 ---------
 .../impl/JGroupsFileBroadcastGroupControlImpl.java        |  9 ---------
 .../impl/JGroupsPropertiesBroadcastGroupControlImpl.java  |  9 ---------
 .../artemis/core/management/impl/MBeanInfoHelper.java     |  5 -----
 .../artemis/core/management/impl/QueueControlImpl.java    |  5 -----
 .../artemis/core/messagecounter/MessageCounter.java       |  5 -----
 .../core/messagecounter/impl/MessageCounterHelper.java    |  7 -------
 .../core/paging/cursor/impl/PageCursorProviderImpl.java   |  2 --
 .../core/paging/cursor/impl/PageSubscriptionImpl.java     |  5 -----
 .../activemq/artemis/core/paging/impl/PageSyncTimer.java  |  1 -
 .../artemis/core/paging/impl/PageTransactionInfoImpl.java |  9 ---------
 .../core/paging/impl/PagingStoreFactoryDatabase.java      |  1 -
 .../artemis/core/paging/impl/PagingStoreFactoryNIO.java   |  1 -
 .../artemis/core/paging/impl/PagingStoreImpl.java         |  1 -
 .../core/persistence/config/PersistedAddressSetting.java  |  9 ---------
 .../core/persistence/config/PersistedSecuritySetting.java |  9 ---------
 .../impl/journal/AbstractJournalStorageManager.java       |  6 ------
 .../persistence/impl/journal/BatchingIDGenerator.java     |  1 -
 .../core/persistence/impl/journal/BufferSplitter.java     |  1 -
 .../artemis/core/postoffice/impl/PostOfficeImpl.java      |  2 --
 .../core/impl/wireformat/NodeAnnounceMessage.java         |  1 -
 .../core/impl/wireformat/ReplicationAddMessage.java       |  1 -
 .../core/impl/wireformat/ReplicationAddTXMessage.java     |  1 -
 .../core/impl/wireformat/ReplicationPageWriteMessage.java |  1 -
 .../core/impl/wireformat/ReplicationPrepareMessage.java   |  1 -
 .../artemis/core/remoting/impl/netty/NettyAcceptor.java   |  2 --
 .../core/remoting/server/impl/RemotingServiceImpl.java    |  1 -
 .../artemis/core/replication/ReplicationEndpoint.java     |  1 -
 .../artemis/core/replication/ReplicationManager.java      |  1 -
 .../artemis/core/server/cluster/impl/BridgeImpl.java      |  1 -
 .../core/server/cluster/impl/ClusterConnectionImpl.java   |  2 --
 .../artemis/core/server/impl/ActiveMQServerImpl.java      |  5 -----
 .../activemq/artemis/core/server/impl/QueueImpl.java      |  3 ---
 .../artemis/core/server/impl/ServerConsumerImpl.java      |  4 ----
 .../activemq/artemis/core/server/impl/ServerInfo.java     |  1 -
 .../server/management/impl/ManagementServiceImpl.java     |  2 --
 .../spi/core/security/ActiveMQSecurityManagerImpl.java    |  2 +-
 .../activemq/artemis/core/config/impl/ValidatorsTest.java |  9 ---------
 .../activemq/artemis/core/filter/impl/FilterTest.java     |  2 --
 .../impl/journal/OperationContextUnitTest.java            |  8 --------
 .../apache/activemq/artemis/core/security/RoleTest.java   |  7 -------
 .../artemis/core/version/impl/VersionImplTest.java        |  7 -------
 .../activemq/artemis/tests/util/ActiveMQTestBase.java     |  2 --
 .../activemq/artemis/jms/example/TextReverserService.java |  9 ---------
 .../org/apache/activemq/artemis/jms/example/DummyXid.java |  3 +--
 .../org/apache/activemq/artemis/jms/example/DummyXid.java |  3 +--
 .../org/apache/activemq/artemis/jms/example/DummyXid.java |  3 +--
 .../activemq/broker/artemiswrapper/InVMNameParser.java    |  9 ---------
 .../activemq/broker/artemiswrapper/InVMNamingContext.java |  5 -----
 .../java/org/apache/activemq/perf/NetworkedSyncTest.java  |  1 -
 .../artemis/tests/extras/jms/bridge/BridgeTestBase.java   |  1 -
 .../artemis/tests/extras/jms/bridge/JMSBridgeTest.java    |  3 ---
 .../tests/extras/jms/xa/JMSXDeliveryCountTest.java        |  9 +--------
 .../activemq/artemis/tests/extras/jms/xa/XATest.java      |  1 -
 .../tests/integration/SimpleNotificationService.java      |  9 ---------
 .../artemis/tests/integration/String64KLimitTest.java     |  1 -
 .../tests/integration/client/BlockingSendTest.java        |  1 -
 .../tests/integration/client/ConsumerCloseTest.java       |  3 ---
 .../integration/client/CreateQueueIdempotentTest.java     |  8 --------
 .../tests/integration/client/DurableQueueTest.java        |  3 ---
 .../tests/integration/client/ExpireTestOnRestartTest.java |  8 --------
 .../tests/integration/client/ExpiryLargeMessageTest.java  |  9 ---------
 .../artemis/tests/integration/client/HeuristicXATest.java |  5 -----
 .../tests/integration/client/IncompatibleVersionTest.java |  1 -
 .../tests/integration/client/JmsNettyNioStressTest.java   |  9 ---------
 .../tests/integration/client/LargeMessageTest.java        |  4 ----
 .../integration/client/LibaioDependencyCheckTest.java     |  9 ---------
 .../integration/client/MessageConsumerRollbackTest.java   |  1 -
 .../tests/integration/client/MessageDurabilityTest.java   |  5 -----
 .../tests/integration/client/MessageExpirationTest.java   |  2 --
 .../tests/integration/client/MessagePriorityTest.java     |  5 -----
 .../artemis/tests/integration/client/MessageRateTest.java |  1 -
 .../artemis/tests/integration/client/MixRoutingTest.java  |  1 -
 .../integration/client/MultipleThreadFilterOneTest.java   |  9 ---------
 .../artemis/tests/integration/client/NIOvsOIOTest.java    |  1 -
 .../integration/client/NettyConsumerWindowSizeTest.java   |  9 ---------
 .../artemis/tests/integration/client/OrderTest.java       |  9 ---------
 .../tests/integration/client/ProducerCloseTest.java       |  2 --
 .../tests/integration/client/RedeliveryConsumerTest.java  |  3 ---
 .../tests/integration/client/SelfExpandingBufferTest.java |  2 --
 .../tests/integration/client/SessionCloseTest.java        |  5 -----
 .../tests/integration/client/TemporaryQueueTest.java      |  2 --
 .../tests/integration/clientcrash/ClientCrashTest.java    |  3 ---
 .../tests/integration/clientcrash/ClientExitTest.java     |  6 ------
 .../tests/integration/clientcrash/CrashClient.java        | 13 -------------
 .../tests/integration/clientcrash/CrashClient2.java       | 13 -------------
 .../tests/integration/clientcrash/GracefulClient.java     | 13 -------------
 .../integration/cluster/distribution/ClusterTestBase.java |  2 --
 .../cluster/distribution/SimpleSymmetricClusterTest.java  |  9 ---------
 .../TwoWayTwoNodeClusterWithDiscoveryTest.java            |  5 -----
 .../tests/integration/cluster/failover/FailoverTest.java  |  3 ---
 .../integration/cluster/failover/FailoverTestBase.java    |  2 --
 .../integration/cluster/failover/PagingFailoverTest.java  |  3 ---
 .../reattach/MultiThreadRandomReattachTestBase.java       |  5 -----
 .../reattach/MultiThreadReattachSupportTestBase.java      |  2 --
 .../integration/cluster/reattach/OrderReattachTest.java   |  1 -
 .../integration/cluster/reattach/RandomReattachTest.java  |  5 -----
 .../tests/integration/cluster/reattach/ReattachTest.java  |  4 ----
 .../artemis/tests/integration/jms/FloodServerTest.java    |  5 -----
 .../jms/ManualReconnectionToSingleServerTest.java         |  4 ----
 .../tests/integration/jms/client/CreateQueueTest.java     |  1 -
 .../tests/integration/jms/client/ExpiryMessageTest.java   |  5 -----
 .../artemis/tests/integration/jms/client/MessageTest.java |  5 -----
 .../integration/jms/client/NewQueueRequestorTest.java     |  8 --------
 .../integration/jms/client/NoLocalSubscriberTest.java     |  1 -
 .../tests/integration/jms/client/PreACKJMSTest.java       |  5 -----
 .../tests/integration/jms/client/ReSendMessageTest.java   |  5 -----
 .../SessionClosedOnRemotingConnectionFailureTest.java     |  7 -------
 .../tests/integration/jms/client/StoreConfigTest.java     |  8 --------
 .../tests/integration/jms/client/TextMessageTest.java     |  3 ---
 .../integration/jms/cluster/JMSFailoverListenerTest.java  |  5 -----
 .../tests/integration/jms/cluster/JMSFailoverTest.java    |  5 -----
 .../tests/integration/jms/cluster/JMSReconnectTest.java   |  4 ----
 .../jms/cluster/TemporaryQueueClusterTest.java            |  9 ---------
 .../tests/integration/jms/cluster/TopicClusterTest.java   |  9 ---------
 .../connection/ConnectionFactorySerializationTest.java    |  5 -----
 .../ConnectionFactoryWithJGroupsSerializationTest.java    |  1 -
 .../integration/jms/largemessage/JMSLargeMessageTest.java |  9 ---------
 .../integration/jms/server/JMSServerDeployerTest.java     |  5 -----
 .../jms/server/config/JMSServerConfigParserTest.java      |  9 ---------
 .../tests/integration/jms/server/management/JMSUtil.java  |  9 ---------
 .../tests/integration/journal/NIOImportExportTest.java    |  9 ---------
 .../journal/ValidateTransactionHealthTest.java            |  3 ---
 .../integration/largemessage/LargeMessageTestBase.java    |  5 -----
 .../integration/largemessage/ServerLargeMessageTest.java  | 11 +----------
 .../tests/integration/management/AcceptorControlTest.java |  3 ---
 .../management/AcceptorControlUsingCoreTest.java          |  1 -
 .../integration/management/ActiveMQServerControlTest.java |  5 -----
 .../management/ActiveMQServerControlUsingCoreTest.java    |  9 ---------
 .../tests/integration/management/AddressControlTest.java  |  4 ----
 .../management/AddressControlUsingCoreTest.java           |  3 ---
 .../management/BridgeControlUsingCoreTest.java            |  2 --
 .../management/ClusterConnectionControl2Test.java         |  1 -
 .../management/ClusterConnectionControlTest.java          |  5 -----
 .../management/ClusterConnectionControlUsingCoreTest.java |  9 ---------
 .../tests/integration/management/CoreMessagingProxy.java  |  5 -----
 .../tests/integration/management/DivertControlTest.java   |  3 ---
 .../management/DivertControlUsingCoreTest.java            |  9 ---------
 .../integration/management/ManagementControlHelper.java   |  9 ---------
 .../integration/management/ManagementHelperTest.java      |  9 ---------
 .../integration/management/ManagementServiceImplTest.java |  6 ------
 .../tests/integration/management/ManagementTestBase.java  |  5 -----
 .../tests/integration/management/NotificationTest.java    |  5 -----
 .../tests/integration/management/QueueControlTest.java    |  2 --
 .../management/SSLSecurityNotificationTest.java           |  2 --
 .../management/SecurityManagementTestBase.java            |  5 -----
 .../SecurityManagementWithConfiguredAdminUserTest.java    |  5 -----
 .../SecurityManagementWithDefaultConfigurationTest.java   |  4 ----
 .../SecurityManagementWithModifiedConfigurationTest.java  |  5 -----
 .../integration/management/SecurityNotificationTest.java  |  5 -----
 .../tests/integration/paging/PagingCounterTest.java       |  2 --
 .../artemis/tests/integration/paging/PagingSyncTest.java  |  8 --------
 .../integration/persistence/DeleteQueueRestartTest.java   |  9 ---------
 .../tests/integration/persistence/ExportFormatTest.java   |  8 --------
 .../integration/persistence/JMSDynamicConfigTest.java     |  9 ---------
 .../integration/persistence/QueueConfigRestartTest.java   |  9 ---------
 .../tests/integration/persistence/RestartSMTest.java      |  9 ---------
 .../persistence/RolesConfigurationStorageTest.java        |  8 --------
 .../TransportConfigurationEncodingSupportTest.java        |  9 ---------
 .../tests/integration/ra/ActiveMQActivationTest.java      |  9 ---------
 .../tests/integration/remoting/DestroyConsumerTest.java   |  9 ---------
 .../integration/remoting/NettyNetworkAddressTest.java     |  2 --
 .../integration/remoting/NetworkAddressTestBase.java      |  5 -----
 .../artemis/tests/integration/remoting/PingTest.java      |  1 -
 .../artemis/tests/integration/remoting/ReconnectTest.java |  8 --------
 .../tests/integration/remoting/SynchronousCloseTest.java  |  3 ---
 .../tests/integration/replication/ReplicationTest.java    |  2 --
 .../tests/integration/scheduling/DelayedMessageTest.java  |  1 -
 .../scheduling/MultipliedDelayedMessageTest.java          |  1 -
 .../integration/scheduling/ScheduledMessageTest.java      |  1 -
 .../integration/ssl/CoreClientOverOneWaySSLTest.java      |  2 --
 .../integration/ssl/CoreClientOverTwoWaySSLTest.java      |  2 --
 .../activemq/artemis/tests/util/JMSClusteredTestBase.java |  5 -----
 .../activemq/artemis/jms/tests/AcknowledgementTest.java   |  8 --------
 .../artemis/jms/tests/AutoAckMessageListenerTest.java     |  9 ---------
 .../activemq/artemis/jms/tests/CTSMiscellaneousTest.java  |  7 -------
 .../activemq/artemis/jms/tests/ConnectionClosedTest.java  |  9 ---------
 .../apache/activemq/artemis/jms/tests/ConnectionTest.java |  9 ---------
 .../activemq/artemis/jms/tests/ConsumerClosedTest.java    |  7 -------
 .../artemis/jms/tests/DurableSubscriptionTest.java        |  1 -
 .../activemq/artemis/jms/tests/MessageConsumerTest.java   |  6 ------
 .../activemq/artemis/jms/tests/MessageProducerTest.java   |  6 ------
 .../artemis/jms/tests/MessageWithReadResolveTest.java     |  5 -----
 .../activemq/artemis/jms/tests/MiscellaneousTest.java     |  9 ---------
 .../artemis/jms/tests/NonDurableSubscriberTest.java       |  9 ---------
 .../activemq/artemis/jms/tests/ReferenceableTest.java     |  1 -
 .../apache/activemq/artemis/jms/tests/SessionTest.java    |  1 -
 .../artemis/jms/tests/TemporaryDestinationTest.java       |  7 -------
 .../org/apache/activemq/artemis/jms/tests/TopicTest.java  |  9 ---------
 .../activemq/artemis/jms/tests/TransactedSessionTest.java |  6 ------
 .../artemis/jms/tests/message/BytesMessageTest.java       |  1 -
 .../jms/tests/message/JMSCorrelationIDHeaderTest.java     |  5 -----
 .../jms/tests/message/JMSDeliveryModeHeaderTest.java      |  9 ---------
 .../jms/tests/message/JMSDestinationHeaderTest.java       |  7 -------
 .../jms/tests/message/JMSExpirationHeaderTest.java        |  9 ---------
 .../artemis/jms/tests/message/JMSMessageIDHeaderTest.java |  7 -------
 .../artemis/jms/tests/message/JMSReplyToHeaderTest.java   |  9 ---------
 .../artemis/jms/tests/message/JMSTimestampHeaderTest.java |  9 ---------
 .../artemis/jms/tests/message/JMSTypeHeaderTest.java      |  9 ---------
 .../artemis/jms/tests/message/MapMessageTest.java         |  1 -
 .../artemis/jms/tests/message/MessageHeaderTest.java      |  9 ---------
 .../jms/tests/message/MessagePropertyConversionTest.java  |  1 -
 .../artemis/jms/tests/message/MessageTestBase.java        |  5 -----
 .../jms/tests/message/ObjectMessageDeliveryTest.java      |  9 ---------
 .../artemis/jms/tests/message/SimpleJMSBytesMessage.java  |  5 -----
 .../artemis/jms/tests/message/SimpleJMSMapMessage.java    |  4 ----
 .../artemis/jms/tests/message/SimpleJMSMessage.java       |  7 -------
 .../artemis/jms/tests/message/SimpleJMSObjectMessage.java |  7 -------
 .../artemis/jms/tests/message/SimpleJMSStreamMessage.java |  7 -------
 .../artemis/jms/tests/message/SimpleJMSTextMessage.java   |  7 -------
 .../artemis/jms/tests/message/StreamMessageTest.java      |  1 -
 .../artemis/jms/tests/message/TextMessageTest.java        |  1 -
 .../activemq/artemis/jms/tests/selector/SelectorTest.java |  6 ------
 .../artemis/jms/tests/tools/container/Constants.java      |  7 -------
 .../artemis/jms/tests/tools/container/InVMContext.java    |  5 -----
 .../tests/tools/container/InVMInitialContextFactory.java  |  7 -------
 .../tools/container/InVMInitialContextFactoryBuilder.java | 15 +--------------
 .../artemis/jms/tests/tools/container/InVMNameParser.java |  9 ---------
 .../jms/tests/tools/container/LocalTestServer.java        | 10 ----------
 .../activemq/artemis/jms/tests/util/JNDIUtilTest.java     |  5 -----
 .../apache/activemq/artemis/common/SpawnedJMSServer.java  |  9 ---------
 .../apache/activemq/artemis/jms/ActiveMQCoreAdmin.java    |  1 -
 .../performance/paging/MeasurePagingMultiThreadTest.java  |  4 ----
 .../artemis/tests/soak/client/ClientAbstract.java         |  9 ---------
 .../tests/soak/client/ClientNonDivertedSoakTest.java      |  9 ---------
 .../artemis/tests/soak/client/ClientSoakTest.java         |  9 ---------
 .../activemq/artemis/tests/soak/client/Receiver.java      |  9 ---------
 .../apache/activemq/artemis/tests/soak/client/Sender.java |  9 ---------
 .../tests/soak/client/SimpleSendReceiveSoakTest.java      |  1 -
 .../tests/stress/chunk/LargeMessageStressTest.java        |  9 ---------
 .../artemis/tests/stress/client/SendStressTest.java       |  9 ---------
 .../tests/stress/failover/RandomReattachStressTest.java   |  5 -----
 .../journal/AIOAllPossibilitiesCompactStressTest.java     |  7 -------
 .../tests/stress/journal/AddAndRemoveStressTest.java      |  1 -
 .../tests/stress/journal/CompactingStressTest.java        |  1 -
 .../stress/journal/JournalCleanupCompactStressTest.java   |  9 ---------
 .../tests/stress/journal/JournalRestartStressTest.java    |  9 ---------
 .../tests/stress/journal/LargeJournalStressTest.java      |  9 ---------
 .../tests/stress/journal/MixupCompactorTestBase.java      |  1 -
 .../stress/journal/MultiThreadConsumerStressTest.java     |  9 ---------
 .../stress/journal/NIOMultiThreadCompactorStressTest.java |  9 ---------
 .../stress/paging/MultipleConsumersPageStressTest.java    |  9 ---------
 .../artemis/tests/stress/paging/PageCursorStressTest.java |  2 --
 .../artemis/tests/stress/paging/PageStressTest.java       |  2 --
 .../timing/core/server/impl/QueueConcurrentTest.java      |  2 --
 .../tests/timing/jms/bridge/impl/JMSBridgeImplTest.java   |  5 -----
 .../unit/core/client/impl/LargeMessageBufferTest.java     |  9 ---------
 .../core/config/impl/ConfigurationValidationTest.java     |  1 -
 .../unit/core/config/impl/TransportConfigurationTest.java |  9 ---------
 .../unit/core/journal/impl/AlignedJournalImplTest.java    |  5 -----
 .../tests/unit/core/journal/impl/CleanBufferTest.java     |  9 ---------
 .../tests/unit/core/journal/impl/JournalAsyncTest.java    |  5 -----
 .../core/journal/impl/SequentialFileFactoryTestBase.java  |  2 --
 .../tests/unit/core/journal/impl/TimedBufferTest.java     |  1 -
 .../journal/impl/fakes/FakeSequentialFileFactory.java     |  5 -----
 .../unit/core/journal/impl/fakes/SimpleEncoding.java      |  9 ---------
 .../tests/unit/core/message/impl/MessageImplTest.java     |  3 ---
 .../tests/unit/core/paging/impl/PagePositionTest.java     |  9 ---------
 .../artemis/tests/unit/core/paging/impl/PageTest.java     |  1 -
 .../core/postoffice/impl/DuplicateDetectionUnitTest.java  |  1 -
 .../tests/unit/core/remoting/ActiveMQBufferTestBase.java  |  5 -----
 .../remoting/impl/netty/ChannelBufferWrapper2Test.java    |  7 -------
 .../tests/unit/core/remoting/impl/ssl/SSLSupportTest.java |  1 -
 .../server/group/impl/SystemPropertyOverrideTest.java     |  1 -
 .../tests/unit/core/server/impl/QueueImplTest.java        |  2 --
 .../artemis/tests/unit/jms/ActiveMQDestinationTest.java   |  7 -------
 .../tests/unit/jms/client/ActiveMQMapMessageTest.java     |  1 -
 .../tests/unit/jms/client/ActiveMQStreamMessageTest.java  |  3 ---
 .../tests/unit/jms/client/JMSExceptionHelperTest.java     |  1 -
 .../tests/unit/jms/client/SelectorTranslatorTest.java     |  2 --
 .../artemis/tests/unit/jms/misc/ManifestTest.java         |  3 ---
 .../artemis/tests/unit/ra/ResourceAdapterTest.java        |  1 -
 .../ra/referenceable/DestinationObjectFactoryTest.java    |  7 -------
 .../activemq/artemis/tests/unit/util/InVMContext.java     |  5 -----
 .../activemq/artemis/tests/unit/util/InVMNameParser.java  |  9 ---------
 .../artemis/tests/unit/util/InVMNamingContext.java        |  5 -----
 .../unit/util/ObjectInputStreamWithClassLoaderTest.java   |  5 -----
 .../artemis/tests/unit/util/SoftValueMapTest.java         |  9 ---------
 .../artemis/tests/unit/util/UUIDGeneratorTest.java        |  7 -------
 .../artemis/tests/unit/util/VersionLoaderTest.java        |  7 -------
 403 files changed, 8 insertions(+), 1998 deletions(-)

diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XmlDataExporter.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XmlDataExporter.java
index 1daf213..f53aad1 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XmlDataExporter.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XmlDataExporter.java
@@ -456,8 +456,6 @@ public final class XmlDataExporter extends DBOption {
       return queues;
    }
 
-   // Inner classes -------------------------------------------------
-
    /**
     * Proxy to handle indenting the XML since <code>javax.xml.stream.XMLStreamWriter</code> doesn't support that.
     */
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/SimpleString.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/SimpleString.java
index a468888..bce501c 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/SimpleString.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/SimpleString.java
@@ -220,9 +220,6 @@ public final class SimpleString implements CharSequence, Serializable, Comparabl
       return toString().compareTo(o.toString());
    }
 
-   // Public
-   // ---------------------------------------------------------------------------
-
    /**
     * returns the underlying byte array of this SimpleString
     *
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/RandomUtil.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/RandomUtil.java
index afd88d1..2253190 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/RandomUtil.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/RandomUtil.java
@@ -128,15 +128,4 @@ public class RandomUtil {
       return RandomUtil.random.nextFloat();
    }
 
-
-
-   // Public --------------------------------------------------------
-
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
 }
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDGenerator.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDGenerator.java
index 6447581..c59ca1c 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDGenerator.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDGenerator.java
@@ -206,7 +206,6 @@ public final class UUIDGenerator {
       return null;
    }
 
-   // Private -------------------------------------------------------
 
    private static boolean isBlackList(final byte[] address) {
       for (byte[] blackList : UUIDGenerator.BLACK_LIST) {
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDTimer.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDTimer.java
index d96313b..add7c12 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDTimer.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDTimer.java
@@ -66,8 +66,6 @@ import java.util.Random;
  * lock), and so has no method synchronization.
  */
 public class UUIDTimer {
-   // // // Constants
-
    /**
     * Since System.longTimeMillis() returns time from january 1st 1970, and
     * UUIDs need time from the beginning of gregorian calendar (15-oct-1582),
@@ -245,11 +243,6 @@ public class UUIDTimer {
       uuidData[UUID.INDEX_CLOCK_LO + 3] = (byte) clockLo;
    }
 
-   /*
-    * /////////////////////////////////////////////////////////// // Private
-    * methods ///////////////////////////////////////////////////////////
-    */
-
    private static final int MAX_WAIT_COUNT = 50;
 
    /**
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/TypedProperties.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/TypedProperties.java
index 4c5190d..cde5e1e 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/TypedProperties.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/TypedProperties.java
@@ -630,8 +630,6 @@ public class TypedProperties {
       return sb.append("]").toString();
    }
 
-   // Private ------------------------------------------------------------------------------------
-
    private synchronized void doPutValue(final SimpleString key, final PropertyValue value) {
       if (!internalProperties && internalPropertyPredicate != null && internalPropertyPredicate.test(key)) {
          internalProperties = true;
@@ -676,8 +674,6 @@ public class TypedProperties {
       }
    }
 
-   // Inner classes ------------------------------------------------------------------------------
-
    private abstract static class PropertyValue {
 
       abstract Object getValue();
diff --git a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ConcurrentHashSetTest.java b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ConcurrentHashSetTest.java
index b7adddc..7dbc96c 100644
--- a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ConcurrentHashSetTest.java
+++ b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ConcurrentHashSetTest.java
@@ -32,8 +32,6 @@ public class ConcurrentHashSetTest extends Assert {
    private String element;
 
 
-   // Public --------------------------------------------------------
-
    @Test
    public void testAdd() throws Exception {
       Assert.assertTrue(set.add(element));
@@ -114,12 +112,4 @@ public class ConcurrentHashSetTest extends Assert {
       set = new ConcurrentHashSet<>();
       element = RandomUtil.randomString();
    }
-
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
 }
diff --git a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/TypedPropertiesConversionTest.java b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/TypedPropertiesConversionTest.java
index fe8a297..5eee3e9 100644
--- a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/TypedPropertiesConversionTest.java
+++ b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/TypedPropertiesConversionTest.java
@@ -32,8 +32,6 @@ public class TypedPropertiesConversionTest {
 
    private final SimpleString unknownKey = new SimpleString("this.key.is.never.used");
 
-   // Public --------------------------------------------------------
-
    @Before
    public void setUp() throws Exception {
       key = RandomUtil.randomSimpleString();
@@ -291,12 +289,4 @@ public class TypedPropertiesConversionTest {
       Assert.assertNull(props.getBytesProperty(unknownKey));
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/TypedPropertiesTest.java b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/TypedPropertiesTest.java
index 112d589..1955e36 100644
--- a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/TypedPropertiesTest.java
+++ b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/TypedPropertiesTest.java
@@ -58,8 +58,6 @@ public class TypedPropertiesTest {
 
 
 
-   // Public --------------------------------------------------------
-
    private TypedProperties props;
 
    private SimpleString key;
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/AddressSettingsInfo.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/AddressSettingsInfo.java
index 24938e9..ebe030b 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/AddressSettingsInfo.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/AddressSettingsInfo.java
@@ -316,8 +316,6 @@ public final class AddressSettingsInfo {
       this.enableMetrics = enableMetrics;
    }
 
-   // Public --------------------------------------------------------
-
    public int getPageCacheMaxSize() {
       return pageCacheMaxSize;
    }
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/DayCounterInfo.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/DayCounterInfo.java
index 73549e6..3955a8b 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/DayCounterInfo.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/DayCounterInfo.java
@@ -78,8 +78,6 @@ public final class DayCounterInfo {
       this.counters = counters;
    }
 
-   // Public --------------------------------------------------------
-
    /**
     * Returns the date of the counter.
     */
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/MessageCounterInfo.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/MessageCounterInfo.java
index e5f9bd8..5282387 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/MessageCounterInfo.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/MessageCounterInfo.java
@@ -89,8 +89,6 @@ public final class MessageCounterInfo {
       this.updateTimestamp = updateTimestamp;
    }
 
-   // Public --------------------------------------------------------
-
    /**
     * Returns the name of the queue.
     */
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ObjectNameBuilder.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ObjectNameBuilder.java
index 259dee0..559f740 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ObjectNameBuilder.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ObjectNameBuilder.java
@@ -73,8 +73,6 @@ public final class ObjectNameBuilder {
       this.jmxUseBrokerName = jmxUseBrokerName;
    }
 
-   // Public --------------------------------------------------------
-
    /**
     * Returns the ObjectName used by the single {@link ActiveMQServerControl}.
     */
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientConsumerImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientConsumerImpl.java
index 1127840..5000159 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientConsumerImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientConsumerImpl.java
@@ -857,18 +857,6 @@ public final class ClientConsumerImpl implements ClientConsumerInternal {
       }
    }
 
-   // Public
-   // ---------------------------------------------------------------------------------------
-
-   // Package protected
-   // ---------------------------------------------------------------------------------------
-
-   // Protected
-   // ---------------------------------------------------------------------------------------
-
-   // Private
-   // ---------------------------------------------------------------------------------------
-
    /**
     * Sending an initial credit for slow consumers
     */
@@ -1137,9 +1125,6 @@ public final class ClientConsumerImpl implements ClientConsumerInternal {
          '}';
    }
 
-   // Inner classes
-   // --------------------------------------------------------------------------------
-
    private class Runner implements Runnable {
 
       @Override
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientLargeMessageImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientLargeMessageImpl.java
index 92a808a..ca57a70 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientLargeMessageImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientLargeMessageImpl.java
@@ -55,8 +55,6 @@ public final class ClientLargeMessageImpl extends ClientMessageImpl implements C
       super();
    }
 
-   // Public --------------------------------------------------------
-
    @Override
    public int getEncodeSize() {
       if (writableBuffer != null) {
@@ -160,8 +158,6 @@ public final class ClientLargeMessageImpl extends ClientMessageImpl implements C
       }
    }
 
-   // Inner classes -------------------------------------------------
-
    private static class ActiveMQOutputStream extends OutputStream {
 
       private final ActiveMQBuffer bufferOut;
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerImpl.java
index 42e66dd..59e29c3 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerImpl.java
@@ -192,8 +192,6 @@ public class ClientProducerImpl implements ClientProducerInternal {
       return rateLimiter == null ? -1 : rateLimiter.getRate();
    }
 
-   // Public ---------------------------------------------------------------------------------------
-
    @Override
    public ClientProducerCredits getProducerCredits() {
       return producerCredits;
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
index 5d831da..5f1d6e5 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
@@ -1959,9 +1959,6 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi
       connectionFailed(me, failedOver);
    }
 
-   // Public
-   // ----------------------------------------------------------------------------
-
    @Override
    public void setForceNotSameRM(final boolean force) {
       forceNotSameRM = force;
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/CompressedLargeMessageControllerImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/CompressedLargeMessageControllerImpl.java
index a691387..eae6832 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/CompressedLargeMessageControllerImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/CompressedLargeMessageControllerImpl.java
@@ -718,8 +718,6 @@ final class CompressedLargeMessageControllerImpl implements LargeMessageControll
       throw new UnsupportedOperationException();
    }
 
-   // Inner classes -------------------------------------------------
-
    @Override
    public ByteBuf byteBuf() {
       return null;
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/LargeMessageControllerImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/LargeMessageControllerImpl.java
index 430e821..4b9ba0c 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/LargeMessageControllerImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/LargeMessageControllerImpl.java
@@ -122,8 +122,6 @@ public class LargeMessageControllerImpl implements LargeMessageController {
       this.bufferSize = bufferSize;
    }
 
-   // Public --------------------------------------------------------
-
    public void setLocal(boolean local) {
       this.local = local;
    }
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/PacketImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/PacketImpl.java
index 2fd5dd2..23e20fe 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/PacketImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/PacketImpl.java
@@ -293,8 +293,6 @@ public class PacketImpl implements Packet {
       this.type = type;
    }
 
-   // Public --------------------------------------------------------
-
    public SimpleString convertName(SimpleString name) {
       if (name == null) {
          return null;
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ActiveMQExceptionMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ActiveMQExceptionMessage.java
index acf7dd6..eaf348c 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ActiveMQExceptionMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ActiveMQExceptionMessage.java
@@ -36,8 +36,6 @@ public class ActiveMQExceptionMessage extends PacketImpl {
       super(EXCEPTION);
    }
 
-   // Public --------------------------------------------------------
-
    @Override
    public boolean isResponse() {
       return true;
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ActiveMQExceptionMessage_V2.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ActiveMQExceptionMessage_V2.java
index 1e0378d..174a822 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ActiveMQExceptionMessage_V2.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ActiveMQExceptionMessage_V2.java
@@ -35,8 +35,6 @@ public class ActiveMQExceptionMessage_V2 extends ActiveMQExceptionMessage {
       super();
    }
 
-   // Public --------------------------------------------------------
-
    @Override
    public boolean isResponse() {
       return true;
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage.java
index 30b29bd..578ecac 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage.java
@@ -58,8 +58,6 @@ public class ClusterTopologyChangeMessage extends PacketImpl {
       super(CLUSTER_TOPOLOGY);
    }
 
-   // Public --------------------------------------------------------
-
    /**
     * @param clusterTopologyV2
     */
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateAddressMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateAddressMessage.java
index d77e976..2d97d44 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateAddressMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateAddressMessage.java
@@ -49,8 +49,6 @@ public class CreateAddressMessage extends PacketImpl {
       super(CREATE_ADDRESS);
    }
 
-   // Public --------------------------------------------------------
-
    @Override
    protected String getPacketString() {
       StringBuffer buff = new StringBuffer(super.getPacketString());
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateQueueMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateQueueMessage.java
index 0b39505..054147d 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateQueueMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateQueueMessage.java
@@ -59,7 +59,6 @@ public class CreateQueueMessage extends PacketImpl {
       super(CREATE_QUEUE);
    }
 
-   // Public --------------------------------------------------------
    /**
     * @param createQueueMessageV2
     */
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateQueueMessage_V2.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateQueueMessage_V2.java
index f376f82..bdee02f 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateQueueMessage_V2.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateQueueMessage_V2.java
@@ -188,8 +188,6 @@ public class CreateQueueMessage_V2 extends CreateQueueMessage {
       super(CREATE_QUEUE_V2);
    }
 
-   // Public --------------------------------------------------------
-
    public QueueConfiguration toQueueConfiguration() {
       return new QueueConfiguration(queueName)
          .setAddress(address)
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateSessionMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateSessionMessage.java
index d38618c..b2e22d6 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateSessionMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateSessionMessage.java
@@ -108,8 +108,6 @@ public class CreateSessionMessage extends PacketImpl {
       super(type);
    }
 
-   // Public --------------------------------------------------------
-
    public String getName() {
       return name;
    }
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateSessionMessage_V2.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateSessionMessage_V2.java
index aed5e31..fb3fee5 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateSessionMessage_V2.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateSessionMessage_V2.java
@@ -44,8 +44,6 @@ public class CreateSessionMessage_V2 extends CreateSessionMessage {
       super(CREATESESSION_V2);
    }
 
-   // Public --------------------------------------------------------
-
 
    public String getClientID() {
       return clientID;
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateSharedQueueMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateSharedQueueMessage.java
index 14bc679..b8c45cc 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateSharedQueueMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateSharedQueueMessage.java
@@ -54,8 +54,6 @@ public class CreateSharedQueueMessage extends PacketImpl {
       super(packetType);
    }
 
-   // Public --------------------------------------------------------
-
    @Override
    protected String getPacketString() {
       StringBuffer buff = new StringBuffer(super.getPacketString());
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/DisconnectMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/DisconnectMessage.java
index 3b6a4a4..a2333f1 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/DisconnectMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/DisconnectMessage.java
@@ -40,8 +40,6 @@ public class DisconnectMessage extends PacketImpl {
       super(disconnectV2);
    }
 
-   // Public --------------------------------------------------------
-
    public SimpleString getNodeID() {
       return nodeID;
    }
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/DisconnectMessage_V2.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/DisconnectMessage_V2.java
index 5196ef1..9946159 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/DisconnectMessage_V2.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/DisconnectMessage_V2.java
@@ -35,8 +35,6 @@ public class DisconnectMessage_V2 extends DisconnectMessage {
       super(DISCONNECT_V2);
    }
 
-   // Public --------------------------------------------------------
-
    public SimpleString getScaleDownNodeID() {
       return scaleDownNodeID;
    }
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/DisconnectMessage_V3.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/DisconnectMessage_V3.java
index 35c9eaa..f6ebcdf 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/DisconnectMessage_V3.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/DisconnectMessage_V3.java
@@ -46,8 +46,6 @@ public class DisconnectMessage_V3 extends DisconnectMessage {
       super(DISCONNECT_V3);
    }
 
-   // Public --------------------------------------------------------
-
    public DisconnectReason getReason() {
       return reason;
    }
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/NullResponseMessage_V2.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/NullResponseMessage_V2.java
index c69b162..b5d1132 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/NullResponseMessage_V2.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/NullResponseMessage_V2.java
@@ -32,8 +32,6 @@ public class NullResponseMessage_V2 extends NullResponseMessage {
       super();
    }
 
-   // Public --------------------------------------------------------
-
    @Override
    public long getCorrelationID() {
       return correlationID;
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/PacketsConfirmedMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/PacketsConfirmedMessage.java
index a909af7..08cf738 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/PacketsConfirmedMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/PacketsConfirmedMessage.java
@@ -33,8 +33,6 @@ public class PacketsConfirmedMessage extends PacketImpl {
       super(PACKETS_CONFIRMED);
    }
 
-   // Public --------------------------------------------------------
-
    public int getCommandID() {
       return commandID;
    }
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReattachSessionResponseMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReattachSessionResponseMessage.java
index 9f7e5a9..6807cca 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReattachSessionResponseMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReattachSessionResponseMessage.java
@@ -37,8 +37,6 @@ public class ReattachSessionResponseMessage extends PacketImpl {
       super(REATTACH_SESSION_RESP);
    }
 
-   // Public --------------------------------------------------------
-
    public int getLastConfirmedCommandID() {
       return lastConfirmedCommandID;
    }
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionAcknowledgeMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionAcknowledgeMessage.java
index a8e10bd..e5d698f 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionAcknowledgeMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionAcknowledgeMessage.java
@@ -41,8 +41,6 @@ public class SessionAcknowledgeMessage extends PacketImpl {
       super(SESS_ACKNOWLEDGE);
    }
 
-   // Public --------------------------------------------------------
-
    public long getConsumerID() {
       return consumerID;
    }
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionCloseMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionCloseMessage.java
index 3024e87..4492519 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionCloseMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionCloseMessage.java
@@ -24,8 +24,6 @@ public class SessionCloseMessage extends PacketImpl {
       super(SESS_CLOSE);
    }
 
-   // Public --------------------------------------------------------
-
    @Override
    public boolean equals(final Object other) {
       if (other instanceof SessionCloseMessage == false) {
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionConsumerCloseMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionConsumerCloseMessage.java
index df51265..72b03ea 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionConsumerCloseMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionConsumerCloseMessage.java
@@ -33,8 +33,6 @@ public class SessionConsumerCloseMessage extends PacketImpl {
       super(SESS_CONSUMER_CLOSE);
    }
 
-   // Public --------------------------------------------------------
-
    public long getConsumerID() {
       return consumerID;
    }
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionConsumerFlowCreditMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionConsumerFlowCreditMessage.java
index 8b1aa0e..05649e6 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionConsumerFlowCreditMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionConsumerFlowCreditMessage.java
@@ -34,8 +34,6 @@ public class SessionConsumerFlowCreditMessage extends PacketImpl {
       super(SESS_FLOWTOKEN);
    }
 
-   // Public --------------------------------------------------------
-
    public long getConsumerID() {
       return consumerID;
    }
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionContinuationMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionContinuationMessage.java
index d5e48c5..b02c724 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionContinuationMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionContinuationMessage.java
@@ -41,8 +41,6 @@ public abstract class SessionContinuationMessage extends PacketImpl {
       super(type);
    }
 
-   // Public --------------------------------------------------------
-
    /**
     * @return the body
     */
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionExpireMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionExpireMessage.java
index 058c954..1ae0760 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionExpireMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionExpireMessage.java
@@ -39,8 +39,6 @@ public class SessionExpireMessage extends PacketImpl {
       super(SESS_EXPIRED);
    }
 
-   // Public --------------------------------------------------------
-
    public long getConsumerID() {
       return consumerID;
    }
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionIndividualAcknowledgeMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionIndividualAcknowledgeMessage.java
index f99ef4b..ffee84e 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionIndividualAcknowledgeMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionIndividualAcknowledgeMessage.java
@@ -45,8 +45,6 @@ public class SessionIndividualAcknowledgeMessage extends PacketImpl {
       super(SESS_INDIVIDUAL_ACKNOWLEDGE);
    }
 
-   // Public --------------------------------------------------------
-
    public long getConsumerID() {
       return consumerID;
    }
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionReceiveContinuationMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionReceiveContinuationMessage.java
index 898d36a..98e1af8 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionReceiveContinuationMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionReceiveContinuationMessage.java
@@ -62,15 +62,11 @@ public class SessionReceiveContinuationMessage extends SessionContinuationMessag
       return consumerID;
    }
 
-   // Protected -----------------------------------------------------
-
    @Override
    public int expectedEncodeSize() {
       return super.expectedEncodeSize() + DataConstants.SIZE_LONG;
    }
 
-   // Public --------------------------------------------------------
-
    @Override
    public void encodeRest(final ActiveMQBuffer buffer) {
       super.encodeRest(buffer);
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionReceiveMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionReceiveMessage.java
index f138326..8edbcac 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionReceiveMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionReceiveMessage.java
@@ -40,8 +40,6 @@ public class SessionReceiveMessage extends MessagePacket {
       super(SESS_RECEIVE_MSG, message);
    }
 
-   // Public --------------------------------------------------------
-
    public long getConsumerID() {
       return consumerID;
    }
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionRequestProducerCreditsMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionRequestProducerCreditsMessage.java
index 38a8d0e..a2fe995 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionRequestProducerCreditsMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionRequestProducerCreditsMessage.java
@@ -38,8 +38,6 @@ public class SessionRequestProducerCreditsMessage extends PacketImpl {
       super(SESS_PRODUCER_REQUEST_CREDITS);
    }
 
-   // Public --------------------------------------------------------
-
    public int getCredits() {
       return credits;
    }
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionSendContinuationMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionSendContinuationMessage.java
index 34c6fbb..1aa5216 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionSendContinuationMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionSendContinuationMessage.java
@@ -94,8 +94,6 @@ public class SessionSendContinuationMessage extends SessionContinuationMessage {
       this.messageBodySize = messageBodySize;
    }
 
-   // Public --------------------------------------------------------
-
    /**
     * @return the requiresResponse
     */
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionSendContinuationMessage_V2.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionSendContinuationMessage_V2.java
index 4d588cd..9fd0968 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionSendContinuationMessage_V2.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionSendContinuationMessage_V2.java
@@ -48,8 +48,6 @@ public class SessionSendContinuationMessage_V2 extends SessionSendContinuationMe
       super(message, body, continues, requiresResponse, messageBodySize, handler);
    }
 
-   // Public --------------------------------------------------------
-
    @Override
    public int expectedEncodeSize() {
       return super.expectedEncodeSize() + DataConstants.SIZE_LONG;
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionSendLargeMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionSendLargeMessage.java
index f45aebc..d187f72 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionSendLargeMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionSendLargeMessage.java
@@ -35,8 +35,6 @@ public class SessionSendLargeMessage extends PacketImpl implements MessagePacket
       this.largeMessage = largeMessage;
    }
 
-   // Public --------------------------------------------------------
-
    public Message getLargeMessage() {
       return largeMessage;
    }
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionSendMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionSendMessage.java
index e3f9766..dafcb8f 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionSendMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionSendMessage.java
@@ -67,8 +67,6 @@ public class SessionSendMessage extends MessagePacket {
       this.handler = null;
    }
 
-   // Public --------------------------------------------------------
-
    @Override
    public boolean isRequiresResponse() {
       return requiresResponse;
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionUniqueAddMetaDataMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionUniqueAddMetaDataMessage.java
index b0f2b34..57e167e 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionUniqueAddMetaDataMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionUniqueAddMetaDataMessage.java
@@ -27,14 +27,4 @@ public class SessionUniqueAddMetaDataMessage extends SessionAddMetaDataMessageV2
       super(SESS_UNIQUE_ADD_METADATA, key, data);
    }
 
-   // Public --------------------------------------------------------
-
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAAfterFailedMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAAfterFailedMessage.java
index e90f570..1e637cb 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAAfterFailedMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAAfterFailedMessage.java
@@ -41,8 +41,6 @@ public class SessionXAAfterFailedMessage extends PacketImpl {
       super(SESS_XA_FAILED);
    }
 
-   // Public --------------------------------------------------------
-
    public Xid getXid() {
       return xid;
    }
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAResponseMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAResponseMessage.java
index a62425c..2841c8c 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAResponseMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAResponseMessage.java
@@ -41,8 +41,6 @@ public class SessionXAResponseMessage extends PacketImpl {
       super(SESS_XA_RESP);
    }
 
-   // Public --------------------------------------------------------
-
    @Override
    public boolean isResponse() {
       return true;
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAResponseMessage_V2.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAResponseMessage_V2.java
index c157e70..c9bf965 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAResponseMessage_V2.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAResponseMessage_V2.java
@@ -32,8 +32,6 @@ public class SessionXAResponseMessage_V2 extends SessionXAResponseMessage {
       super();
    }
 
-   // Public --------------------------------------------------------
-
    @Override
    public long getCorrelationID() {
       return correlationID;
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAResumeMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAResumeMessage.java
index 7342a9a..02b8359 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAResumeMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAResumeMessage.java
@@ -36,8 +36,6 @@ public class SessionXAResumeMessage extends PacketImpl {
       super(SESS_XA_RESUME);
    }
 
-   // Public --------------------------------------------------------
-
    public Xid getXid() {
       return xid;
    }
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXARollbackMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXARollbackMessage.java
index 1ad5db6..8187af9 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXARollbackMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXARollbackMessage.java
@@ -36,8 +36,6 @@ public class SessionXARollbackMessage extends PacketImpl {
       super(SESS_XA_ROLLBACK);
    }
 
-   // Public --------------------------------------------------------
-
    public Xid getXid() {
       return xid;
    }
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXASetTimeoutMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXASetTimeoutMessage.java
index 63c6718..04f5bd4 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXASetTimeoutMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXASetTimeoutMessage.java
@@ -33,8 +33,6 @@ public class SessionXASetTimeoutMessage extends PacketImpl {
       super(SESS_XA_SET_TIMEOUT);
    }
 
-   // Public --------------------------------------------------------
-
    public int getTimeoutSeconds() {
       return timeoutSeconds;
    }
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXASetTimeoutResponseMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXASetTimeoutResponseMessage.java
index efb26d7..1262042 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXASetTimeoutResponseMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXASetTimeoutResponseMessage.java
@@ -33,8 +33,6 @@ public class SessionXASetTimeoutResponseMessage extends PacketImpl {
       super(SESS_XA_SET_TIMEOUT_RESP);
    }
 
-   // Public --------------------------------------------------------
-
    @Override
    public boolean isResponse() {
       return true;
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAStartMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAStartMessage.java
index 92c1abc..b733696 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAStartMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAStartMessage.java
@@ -38,8 +38,6 @@ public class SessionXAStartMessage extends PacketImpl {
       super(SESS_XA_START);
    }
 
-   // Public --------------------------------------------------------
-
    public Xid getXid() {
       return xid;
    }
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessage.java
index 862d4d6..87d8bc4 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessage.java
@@ -43,8 +43,6 @@ public class SubscribeClusterTopologyUpdatesMessage extends PacketImpl {
       super(packetType);
    }
 
-   // Public --------------------------------------------------------
-
    public boolean isClusterConnection() {
       return clusterConnection;
    }
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessageV2.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessageV2.java
index e91f3fc..eb24665 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessageV2.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessageV2.java
@@ -32,8 +32,6 @@ public class SubscribeClusterTopologyUpdatesMessageV2 extends SubscribeClusterTo
       super(SUBSCRIBE_TOPOLOGY_V2);
    }
 
-   // Public --------------------------------------------------------
-
    @Override
    public void encodeRest(final ActiveMQBuffer buffer) {
       super.encodeRest(buffer);
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java
index d2a0595..b1d183a 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java
@@ -301,7 +301,6 @@ public class NettyConnector extends AbstractConnector {
 
    private final ClientProtocolManager protocolManager;
 
-   // Public --------------------------------------------------------
    public NettyConnector(final Map<String, Object> configuration,
                          final BufferHandler handler,
                          final BaseConnectionLifeCycleListener<?> listener,
@@ -960,8 +959,6 @@ public class NettyConnector extends AbstractConnector {
       }
    }
 
-   // Public --------------------------------------------------------
-
    public int getConnectTimeoutMillis() {
       return connectTimeoutMillis;
    }
@@ -970,14 +967,6 @@ public class NettyConnector extends AbstractConnector {
       this.connectTimeoutMillis = connectTimeoutMillis;
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
    private static final class ActiveMQClientChannelHandler extends ActiveMQChannelHandler {
 
       ActiveMQClientChannelHandler(final ChannelGroup group,
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/SSLSupport.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/SSLSupport.java
index 5506181..21f4d8a 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/SSLSupport.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/SSLSupport.java
@@ -241,7 +241,6 @@ public class SSLSupport {
       return supportedSuites.delete(supportedSuites.length() - 2, supportedSuites.length()).toString();
    }
 
-   // Private -------------------------------------------------------
    private TrustManagerFactory loadTrustManagerFactory() throws Exception {
       if (trustManagerFactoryPlugin != null) {
          return AccessController.doPrivileged((PrivilegedAction<TrustManagerFactory>) () -> ((TrustManagerFactoryPlugin) ClassloadingUtil.newInstanceFromClassLoader(SSLSupport.class, trustManagerFactoryPlugin)).getTrustManagerFactory());
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/transaction/impl/XidImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/transaction/impl/XidImpl.java
index ff9416d..cd368ed 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/transaction/impl/XidImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/transaction/impl/XidImpl.java
@@ -87,8 +87,6 @@ public class XidImpl implements Xid, Serializable {
       globalTransactionId = copyBytes(other.getGlobalTransactionId());
    }
 
-   // Xid implementation ------------------------------------------------------------------
-
    @Override
    public byte[] getBranchQualifier() {
       return branchQualifier;
@@ -104,8 +102,6 @@ public class XidImpl implements Xid, Serializable {
       return globalTransactionId;
    }
 
-   // Public -------------------------------------------------------------------------------
-
    @Override
    public int hashCode() {
       if (!hashCalculated) {
@@ -159,7 +155,6 @@ public class XidImpl implements Xid, Serializable {
          " base64:" + toBase64String(this);
    }
 
-   // Private -------------------------------------------------------------------------------
 
    private String stringRep(final byte[] bytes) {
       StringBuffer buff = new StringBuffer();
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/ActiveMQBufferInputStream.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/ActiveMQBufferInputStream.java
index 9176dc3..aaf09bc 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/ActiveMQBufferInputStream.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/ActiveMQBufferInputStream.java
@@ -33,8 +33,6 @@ public class ActiveMQBufferInputStream extends InputStream {
    private ActiveMQBuffer bb;
 
 
-   // Public --------------------------------------------------------
-
    public ActiveMQBufferInputStream(final ActiveMQBuffer paramByteBuffer) {
       bb = paramByteBuffer;
    }
@@ -132,12 +130,6 @@ public class ActiveMQBufferInputStream extends InputStream {
       return false;
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
    /**
     * @return
     */
@@ -145,6 +137,4 @@ public class ActiveMQBufferInputStream extends InputStream {
       return bb.writerIndex() - bb.readerIndex();
    }
 
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/JNDIUtil.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/JNDIUtil.java
index 988c87b..97c3574 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/JNDIUtil.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/JNDIUtil.java
@@ -86,14 +86,4 @@ public class JNDIUtil {
       }
    }
 
-
-   // Public --------------------------------------------------------
-
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
 }
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/ObjectInputStreamWithClassLoader.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/ObjectInputStreamWithClassLoader.java
index 40e7f57..f15f228 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/ObjectInputStreamWithClassLoader.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/ObjectInputStreamWithClassLoader.java
@@ -53,8 +53,6 @@ public class ObjectInputStreamWithClassLoader extends ObjectInputStream {
       setBlackList(blackList);
    }
 
-   // Public ---------------------------------------------------------------------------------------
-
    /**
     * @return the whiteList configured on this policy instance.
     */
@@ -93,10 +91,6 @@ public class ObjectInputStreamWithClassLoader extends ObjectInputStream {
       this.blackList = StringUtil.splitStringList(blackList, ",");
    }
 
-   // Package protected ----------------------------------------------------------------------------
-
-   // Protected ------------------------------------------------------------------------------------
-
    @Override
    protected Class resolveClass(final ObjectStreamClass desc) throws IOException, ClassNotFoundException {
       if (System.getSecurityManager() == null) {
@@ -133,7 +127,6 @@ public class ObjectInputStreamWithClassLoader extends ObjectInputStream {
       }
    }
 
-   // Private --------------------------------------------------------------------------------------
 
    private Class resolveClass0(final ObjectStreamClass desc) throws IOException, ClassNotFoundException {
       String name = desc.getName();
@@ -268,6 +261,4 @@ public class ObjectInputStreamWithClassLoader extends ObjectInputStream {
       return false;
    }
 
-   // Inner classes --------------------------------------------------------------------------------
-
 }
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/SizeFormatterUtil.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/SizeFormatterUtil.java
index 5314cd8..23b1517 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/SizeFormatterUtil.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/SizeFormatterUtil.java
@@ -40,15 +40,4 @@ public class SizeFormatterUtil {
       }
       return String.format("%.2f %s", s, suffix);
    }
-
-   // Public --------------------------------------------------------
-
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/SoftValueLongObjectHashMap.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/SoftValueLongObjectHashMap.java
index bfca0cd..fed5616 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/SoftValueLongObjectHashMap.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/SoftValueLongObjectHashMap.java
@@ -57,8 +57,6 @@ public class SoftValueLongObjectHashMap<V extends SoftValueLongObjectHashMap.Val
       this.maxElements = maxElements;
    }
 
-   // Public --------------------------------------------------------
-
    public void setMaxElements(final int maxElements) {
       this.maxElements = maxElements;
       checkCacheSize();
@@ -332,12 +330,6 @@ public class SoftValueLongObjectHashMap<V extends SoftValueLongObjectHashMap.Val
       return mapDelegate.hashCode();
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
    @SuppressWarnings("unchecked")
    private void processQueue() {
       AggregatedSoftReference ref;
@@ -351,8 +343,6 @@ public class SoftValueLongObjectHashMap<V extends SoftValueLongObjectHashMap.Val
       return new AggregatedSoftReference(key, value, refQueue);
    }
 
-   // Inner classes -------------------------------------------------
-
    static final class AggregatedSoftReference<V> extends SoftReference<V> {
 
       final long key;
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/TimeAndCounterIDGenerator.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/TimeAndCounterIDGenerator.java
index cb56cfb..58213e8 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/TimeAndCounterIDGenerator.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/TimeAndCounterIDGenerator.java
@@ -52,9 +52,7 @@ public class TimeAndCounterIDGenerator implements IDGenerator {
       refresh();
    }
 
-   // Public --------------------------------------------------------
 
-   // Public --------------------------------------------------------
 
    @Override
    public long generateID() {
@@ -132,12 +130,6 @@ public class TimeAndCounterIDGenerator implements IDGenerator {
          ")";
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
    private long newTM() {
       return (System.currentTimeMillis() & TimeAndCounterIDGenerator.MASK_TIME) << TimeAndCounterIDGenerator.BITS_TO_MOVE;
    }
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/XMLUtil.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/XMLUtil.java
index b1a90a8..4c660d0 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/XMLUtil.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/XMLUtil.java
@@ -392,6 +392,4 @@ public final class XMLUtil {
       });
    }
 
-   // Inner classes --------------------------------------------------------------------------------
-
 }
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/XidCodecSupport.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/XidCodecSupport.java
index e7d601f..f746483 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/XidCodecSupport.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/XidCodecSupport.java
@@ -45,14 +45,4 @@ public class XidCodecSupport {
       return DataConstants.SIZE_INT * 3 + xid.getBranchQualifier().length + xid.getGlobalTransactionId().length;
    }
 
-
-   // Public --------------------------------------------------------
-
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
 }
diff --git a/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/TimeAndCounterIDGeneratorTest.java b/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/TimeAndCounterIDGeneratorTest.java
index b7b4db2..081996a 100644
--- a/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/TimeAndCounterIDGeneratorTest.java
+++ b/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/TimeAndCounterIDGeneratorTest.java
@@ -26,8 +26,6 @@ import org.junit.Test;
 
 public class TimeAndCounterIDGeneratorTest extends Assert {
 
-   // Public --------------------------------------------------------
-
    @Test
    public void testCalculation() {
       TimeAndCounterIDGenerator seq = new TimeAndCounterIDGenerator();
diff --git a/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/XMLUtilTest.java b/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/XMLUtilTest.java
index 95756d2..c7bafd9 100644
--- a/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/XMLUtilTest.java
+++ b/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/XMLUtilTest.java
@@ -27,8 +27,6 @@ import org.w3c.dom.NodeList;
 public class XMLUtilTest extends SilentTestCase {
 
 
-   // Public --------------------------------------------------------
-
    @Test
    public void testGetTextContext_1() throws Exception {
       String document = "<blah>foo</blah>";
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQBytesMessage.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQBytesMessage.java
index 4fff128..d6e4541 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQBytesMessage.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQBytesMessage.java
@@ -349,7 +349,6 @@ public class ActiveMQBytesMessage extends ActiveMQMessage implements BytesMessag
       reset();
    }
 
-   // Public --------------------------------------------------------
 
    @Override
    public byte getType() {
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnection.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnection.java
index 7cb526a..f2e468f 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnection.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnection.java
@@ -498,8 +498,6 @@ public class ActiveMQConnection extends ActiveMQConnectionForContextImpl impleme
       return null; // we offer RA
    }
 
-   // Public ---------------------------------------------------------------------------------------
-
    /**
     * Sets a FailureListener for the session which is notified if a failure occurs on the session.
     *
@@ -559,12 +557,6 @@ public class ActiveMQConnection extends ActiveMQConnectionForContextImpl impleme
       return initialSession;
    }
 
-   // Package protected ----------------------------------------------------------------------------
-
-   // Protected ------------------------------------------------------------------------------------
-
-   // In case the user forgets to close the connection manually
-
    @Override
    protected final void finalize() throws Throwable {
       if (!closed) {
@@ -634,7 +626,6 @@ public class ActiveMQConnection extends ActiveMQConnectionForContextImpl impleme
       return sessionFactory;
    }
 
-   // Private --------------------------------------------------------------------------------------
 
    /**
     * @param transacted
@@ -710,8 +701,6 @@ public class ActiveMQConnection extends ActiveMQConnectionForContextImpl impleme
    }
 
 
-   // Inner classes --------------------------------------------------------------------------------
-
    private static class JMSFailureListener implements SessionFailureListener {
 
       private final WeakReference<ActiveMQConnection> connectionRef;
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionFactory.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionFactory.java
index c6d7645..27bfa7d 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionFactory.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionFactory.java
@@ -868,10 +868,6 @@ public class ActiveMQConnectionFactory extends JNDIStorable implements Connectio
       return JMSFactoryType.CF.intValue();
    }
 
-   // Package protected ----------------------------------------------------------------------------
-
-   // Protected ------------------------------------------------------------------------------------
-
    protected synchronized ActiveMQConnection createConnectionInternal(final String username,
                                                                       final String password,
                                                                       final boolean isXA,
@@ -947,7 +943,6 @@ public class ActiveMQConnectionFactory extends JNDIStorable implements Connectio
          "]";
    }
 
-   // Private --------------------------------------------------------------------------------------
 
    private void checkWrite() {
       if (readOnly) {
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQDestination.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQDestination.java
index 2603e7b..a1a04da 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQDestination.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQDestination.java
@@ -425,7 +425,6 @@ public class ActiveMQDestination extends JNDIStorable implements Destination, Se
       return queue;
    }
 
-   // Public --------------------------------------------------------
 
    public String getAddress() {
       return simpleAddress != null ? simpleAddress.toString() : null;
@@ -509,14 +508,6 @@ public class ActiveMQDestination extends JNDIStorable implements Destination, Se
       props.put("address", getAddress());
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
    public enum TYPE {
       QUEUE,
       TOPIC,
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMapMessage.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMapMessage.java
index 38f572e..f9559ec 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMapMessage.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMapMessage.java
@@ -84,7 +84,6 @@ public class ActiveMQMapMessage extends ActiveMQMessage implements MapMessage {
       }
    }
 
-   // Public --------------------------------------------------------
 
    @Override
    public byte getType() {
@@ -330,11 +329,8 @@ public class ActiveMQMapMessage extends ActiveMQMessage implements MapMessage {
       readBodyMap(message.getBodyBuffer(), map);
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
-   // Private -------------------------------------------------------
 
    /**
     * Check the name
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java
index c7bcf78..0991fbc 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java
@@ -767,7 +767,6 @@ public class ActiveMQMessage implements javax.jms.Message {
       return message.getBodySize() == 0;
    }
 
-   // Public --------------------------------------------------------
 
    public void setIndividualAcknowledge() {
       this.individualAck = true;
@@ -861,9 +860,7 @@ public class ActiveMQMessage implements javax.jms.Message {
       return sb.toString();
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
    protected void checkWrite() throws JMSException {
       if (readOnly) {
@@ -877,8 +874,6 @@ public class ActiveMQMessage implements javax.jms.Message {
       }
    }
 
-   // Private ------------------------------------------------------------
-
    private void checkStream() throws JMSException {
       if (!(message.getType() == ActiveMQBytesMessage.TYPE || message.getType() == ActiveMQStreamMessage.TYPE)) {
          throw ActiveMQJMSClientBundle.BUNDLE.onlyValidForByteOrStreamMessages();
@@ -944,5 +939,4 @@ public class ActiveMQMessage implements javax.jms.Message {
       }
    }
 
-   // Inner classes -------------------------------------------------
 }
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageConsumer.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageConsumer.java
index 1f489b6..39b2da7 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageConsumer.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageConsumer.java
@@ -180,7 +180,6 @@ public final class ActiveMQMessageConsumer implements QueueReceiver, TopicSubscr
       return noLocal;
    }
 
-   // Public --------------------------------------------------------
 
    @Override
    public String toString() {
@@ -191,11 +190,8 @@ public final class ActiveMQMessageConsumer implements QueueReceiver, TopicSubscr
       return consumer.isClosed();
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
-   // Private -------------------------------------------------------
 
    private void checkClosed() throws JMSException {
       if (consumer.isClosed() || session.getCoreSession().isClosed()) {
@@ -265,6 +261,4 @@ public final class ActiveMQMessageConsumer implements QueueReceiver, TopicSubscr
       }
    }
 
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageProducer.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageProducer.java
index f058394..cd6cbf4 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageProducer.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageProducer.java
@@ -325,7 +325,6 @@ public class ActiveMQMessageProducer implements MessageProducer, QueueSender, To
       return (Queue) getDestination();
    }
 
-   // Public --------------------------------------------------------
 
    @Override
    public String toString() {
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQObjectMessage.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQObjectMessage.java
index 4d556a1..267dc8a 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQObjectMessage.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQObjectMessage.java
@@ -73,7 +73,6 @@ public class ActiveMQObjectMessage extends ActiveMQMessage implements ObjectMess
       this.options = options;
    }
 
-   // Public --------------------------------------------------------
 
    @Override
    public byte getType() {
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQQueue.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQQueue.java
index 44f3e76..54c1663 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQQueue.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQQueue.java
@@ -63,7 +63,6 @@ public class ActiveMQQueue extends ActiveMQDestination implements Queue {
 
    // Queue implementation ------------------------------------------
 
-   // Public --------------------------------------------------------
 
    @Override
    public String getQueueName() {
@@ -95,11 +94,5 @@ public class ActiveMQQueue extends ActiveMQDestination implements Queue {
       return super.getAddress().hashCode();
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
 }
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQQueueBrowser.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQQueueBrowser.java
index 8135494..76e1306 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQQueueBrowser.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQQueueBrowser.java
@@ -101,21 +101,12 @@ public final class ActiveMQQueueBrowser implements QueueBrowser {
       return queue;
    }
 
-   // Public ---------------------------------------------------------------------------------------
 
    @Override
    public String toString() {
       return "ActiveMQQueueBrowser->" + consumer;
    }
 
-   // Package protected ----------------------------------------------------------------------------
-
-   // Protected ------------------------------------------------------------------------------------
-
-   // Private --------------------------------------------------------------------------------------
-
-   // Inner classes --------------------------------------------------------------------------------
-
    private final class BrowserEnumeration implements Enumeration<ActiveMQMessage> {
 
       ClientMessage current = null;
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java
index 2b33c19..e5e09a1 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java
@@ -1138,7 +1138,6 @@ public class ActiveMQSession implements QueueSession, TopicSession {
       return (TopicSession) getSession();
    }
 
-   // Public --------------------------------------------------------
 
    @Override
    public String toString() {
@@ -1236,8 +1235,6 @@ public class ActiveMQSession implements QueueSession, TopicSession {
       return enable1xPrefixes;
    }
 
-   // Package protected ---------------------------------------------
-
    void deleteQueue(final SimpleString queueName) throws JMSException {
       if (!session.isClosed()) {
          try {
@@ -1252,8 +1249,6 @@ public class ActiveMQSession implements QueueSession, TopicSession {
       return connection;
    }
 
-   // Protected -----------------------------------------------------
-
 
    void checkClosed() throws JMSException {
       if (session.isClosed()) {
@@ -1279,7 +1274,6 @@ public class ActiveMQSession implements QueueSession, TopicSession {
       session.createQueue(queueConfiguration.setName(queueName).setAddress(destination.getAddress()).setAutoCreated(autoCreated).setDurable(durable));
    }
 
-   // Private -------------------------------------------------------
 
 
    private ActiveMQQueue lookupQueue(final String queueName, boolean isTemporary) throws ActiveMQException {
@@ -1336,6 +1330,5 @@ public class ActiveMQSession implements QueueSession, TopicSession {
          return topic;
       }
    }
-   // Inner classes -------------------------------------------------
 
 }
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQStreamMessage.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQStreamMessage.java
index 6904df4..c0ab87e 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQStreamMessage.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQStreamMessage.java
@@ -76,7 +76,6 @@ public class ActiveMQStreamMessage extends ActiveMQMessage implements StreamMess
       message = new ClientMessageImpl((byte) 0, false, 0, 0, (byte) 4, 1500, null);
    }
 
-   // Public --------------------------------------------------------
 
    @Override
    public byte getType() {
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTemporaryQueue.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTemporaryQueue.java
index 26d05eb..f1cffea 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTemporaryQueue.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTemporaryQueue.java
@@ -31,7 +31,6 @@ public class ActiveMQTemporaryQueue extends ActiveMQQueue implements TemporaryQu
 
    // TemporaryQueue implementation ------------------------------------------
 
-   // Public --------------------------------------------------------
    public ActiveMQTemporaryQueue() {
       this(null, null);
    }
@@ -69,11 +68,5 @@ public class ActiveMQTemporaryQueue extends ActiveMQQueue implements TemporaryQu
       return super.getAddress().hashCode();
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
 }
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTemporaryTopic.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTemporaryTopic.java
index 437a9e5..f06f10f 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTemporaryTopic.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTemporaryTopic.java
@@ -32,7 +32,6 @@ public class ActiveMQTemporaryTopic extends ActiveMQTopic implements TemporaryTo
       super(address, true, session);
    }
 
-   // Public --------------------------------------------------------
 
    @Override
    public boolean equals(final Object o) {
@@ -54,12 +53,4 @@ public class ActiveMQTemporaryTopic extends ActiveMQTopic implements TemporaryTo
       return super.getAddress().hashCode();
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTextMessage.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTextMessage.java
index 7b3f930..ebb10ed 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTextMessage.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTextMessage.java
@@ -60,7 +60,6 @@ public class ActiveMQTextMessage extends ActiveMQMessage implements TextMessage
       setText(foreign.getText());
    }
 
-   // Public --------------------------------------------------------
 
    @Override
    public byte getType() {
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTopic.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTopic.java
index 2ca0fe4..ab5ca41 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTopic.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTopic.java
@@ -67,7 +67,6 @@ public class ActiveMQTopic extends ActiveMQDestination implements Topic {
       return getName();
    }
 
-   // Public --------------------------------------------------------
 
    @Override
    public String toString() {
@@ -94,11 +93,5 @@ public class ActiveMQTopic extends ActiveMQDestination implements Topic {
       return super.getAddress().hashCode();
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
 }
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeControlImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeControlImpl.java
index a2a7e72..8363c42 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeControlImpl.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeControlImpl.java
@@ -32,7 +32,6 @@ public class JMSBridgeControlImpl extends StandardMBean implements JMSBridgeCont
       this.bridge = bridge;
    }
 
-   // Public --------------------------------------------------------
 
    @Override
    public void pause() throws Exception {
@@ -207,12 +206,4 @@ public class JMSBridgeControlImpl extends StandardMBean implements JMSBridgeCont
    }
 
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java
index 2da550b..f9dc9f7 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java
@@ -940,10 +940,6 @@ public final class JMSBridgeImpl implements JMSBridge {
       this.tm = tm;
    }
 
-   // Public ---------------------------------------------------------------------------
-
-   // Private -------------------------------------------------------------------
-
    private synchronized void checkParams() {
       checkNotNull(sourceCff, "sourceCff");
       checkNotNull(targetCff, "targetCff");
@@ -1747,8 +1743,6 @@ public final class JMSBridgeImpl implements JMSBridge {
       return service;
    }
 
-   // Inner classes ---------------------------------------------------------------
-
    /**
     * We use a Thread which polls the sourceDestination instead of a MessageListener
     * to ensure that message delivery does not happen concurrently with
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/config/PersistedBindings.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/config/PersistedBindings.java
index 3e92e54..9c28448 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/config/PersistedBindings.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/config/PersistedBindings.java
@@ -49,7 +49,6 @@ public class PersistedBindings implements EncodingSupport {
       this.name = name;
    }
 
-   // Public --------------------------------------------------------
    @Override
    public void decode(ActiveMQBuffer buffer) {
       type = PersistedType.getType(buffer.readByte());
@@ -132,12 +131,4 @@ public class PersistedBindings implements EncodingSupport {
       bindings.remove(address);
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/config/PersistedConnectionFactory.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/config/PersistedConnectionFactory.java
index 5a50bee..54d4601 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/config/PersistedConnectionFactory.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/config/PersistedConnectionFactory.java
@@ -41,7 +41,6 @@ public class PersistedConnectionFactory implements EncodingSupport {
    }
 
 
-   // Public --------------------------------------------------------
 
    /**
     * @return the id
@@ -81,12 +80,4 @@ public class PersistedConnectionFactory implements EncodingSupport {
       return config.getEncodeSize();
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/config/PersistedDestination.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/config/PersistedDestination.java
index 994d386..e898b86 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/config/PersistedDestination.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/config/PersistedDestination.java
@@ -51,15 +51,6 @@ public class PersistedDestination implements EncodingSupport {
       this.selector = selector;
       this.durable = durable;
    }
-   // Public --------------------------------------------------------
-
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
 
    public long getId() {
       return id;
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/impl/journal/JMSJournalStorageManagerImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/impl/journal/JMSJournalStorageManagerImpl.java
index d34f0b9..7f49aaa 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/impl/journal/JMSJournalStorageManagerImpl.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/impl/journal/JMSJournalStorageManagerImpl.java
@@ -98,7 +98,6 @@ public final class JMSJournalStorageManagerImpl implements JMSStorageManager {
       this.idGenerator = idGenerator;
    }
 
-   // Public --------------------------------------------------------
    @Override
    public List<PersistedConnectionFactory> recoverConnectionFactories() {
       List<PersistedConnectionFactory> cfs = new ArrayList<>(mapFactories.values());
@@ -277,11 +276,8 @@ public final class JMSJournalStorageManagerImpl implements JMSStorageManager {
 
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
-   // Private -------------------------------------------------------
 
    private void checkAndCreateDir(final File dir, final boolean create) {
 
@@ -296,6 +292,5 @@ public final class JMSJournalStorageManagerImpl implements JMSStorageManager {
       }
    }
 
-   // Inner classes -------------------------------------------------
 
 }
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java
index d5292c4..e233fec 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java
@@ -949,14 +949,5 @@ public class ConnectionFactoryConfigurationImpl implements ConnectionFactoryConf
       return useTopologyForLoadBalancing;
    }
 
-   // Public --------------------------------------------------------
-
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
 
 }
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/JMSQueueConfigurationImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/JMSQueueConfigurationImpl.java
index 27bf83f..c036bb5 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/JMSQueueConfigurationImpl.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/JMSQueueConfigurationImpl.java
@@ -79,14 +79,5 @@ public class JMSQueueConfigurationImpl implements JMSQueueConfiguration {
       return this;
    }
 
-   // Public --------------------------------------------------------
-
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
 
 }
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/TopicConfigurationImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/TopicConfigurationImpl.java
index 1b02ce3..6db682d 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/TopicConfigurationImpl.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/TopicConfigurationImpl.java
@@ -52,14 +52,5 @@ public class TopicConfigurationImpl implements TopicConfiguration {
       return this;
    }
 
-   // Public --------------------------------------------------------
-
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
 
 }
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/TransportConfigurationEncodingSupport.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/TransportConfigurationEncodingSupport.java
index 9155f00..60e0354 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/TransportConfigurationEncodingSupport.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/TransportConfigurationEncodingSupport.java
@@ -112,14 +112,5 @@ public class TransportConfigurationEncodingSupport {
    }
 
 
-   // Public --------------------------------------------------------
-
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
 
 }
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java
index 534b77d..6284dec 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java
@@ -1329,9 +1329,7 @@ public class JMSServerManagerImpl extends CleaningActivateCallback implements JM
       return server.getActiveMQServerControl().listPreparedTransactionDetailsAsHTML((xid, tx, creation) -> new JMSTransactionDetail(xid, tx, creation));
    }
 
-   // Public --------------------------------------------------------
 
-   // Private -------------------------------------------------------
 
    private synchronized void checkInitialised() {
       if (!active) {
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/AbstractSequentialFile.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/AbstractSequentialFile.java
index 160f92a..7023cdf 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/AbstractSequentialFile.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/AbstractSequentialFile.java
@@ -80,7 +80,6 @@ public abstract class AbstractSequentialFile implements SequentialFile {
       return new LocalBufferObserver();
    }
 
-   // Public --------------------------------------------------------
 
    @Override
    public final boolean exists() {
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/aio/AIOSequentialFile.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/aio/AIOSequentialFile.java
index dc87627..026e217 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/aio/AIOSequentialFile.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/aio/AIOSequentialFile.java
@@ -376,9 +376,6 @@ public class AIOSequentialFile extends AbstractSequentialFile  {
       return "AIOSequentialFile{" + getFileName() + ", opened=" + opened + ", pendingClose=" + pendingClose + ", pendingCallbacks=" + pendingCallbacks + '}';
    }
 
-   // Private methods
-   // -----------------------------------------------------------------------------------------------------
-
    private void checkOpened() {
       if (aioFile == null || !opened) {
          throw new NullPointerException("File not opened, file=null on fileName = " + getFileName());
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/buffer/TimedBuffer.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/buffer/TimedBuffer.java
index 856a7c9..6fc2616 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/buffer/TimedBuffer.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/buffer/TimedBuffer.java
@@ -89,7 +89,6 @@ public final class TimedBuffer extends CriticalComponentImpl {
    private boolean spinning = false;
 
 
-   // Public --------------------------------------------------------
 
    public TimedBuffer(CriticalAnalyzer analyzer, final int size, final int timeout, final boolean logRates) {
       super(analyzer, CRITICAL_PATHS);
@@ -345,14 +344,6 @@ public final class TimedBuffer extends CriticalComponentImpl {
       }
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
    /**
     * Sub classes (tests basically) can use this to override how the sleep is being done
     *
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/AbstractJournalUpdateTask.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/AbstractJournalUpdateTask.java
index 96b385b..765b5e9 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/AbstractJournalUpdateTask.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/AbstractJournalUpdateTask.java
@@ -74,7 +74,6 @@ public abstract class AbstractJournalUpdateTask implements JournalReaderCallback
       this.recordsSnapshot = recordsSnapshot;
    }
 
-   // Public --------------------------------------------------------
 
    public static SequentialFile writeControlFile(final SequentialFileFactory fileFactory,
                                                  final List<JournalFile> files,
@@ -248,9 +247,7 @@ public abstract class AbstractJournalUpdateTask implements JournalReaderCallback
       return recordsSnapshot.contains(id);
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
    /**
     * @throws Exception
@@ -306,8 +303,6 @@ public abstract class AbstractJournalUpdateTask implements JournalReaderCallback
       writeEncoder(record);
    }
 
-   // Private -------------------------------------------------------
 
-   // Inner classes -------------------------------------------------
 
 }
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalFilesRepository.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalFilesRepository.java
index c094a43..2d951c4 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalFilesRepository.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalFilesRepository.java
@@ -138,7 +138,6 @@ public class JournalFilesRepository {
       this.maxAtticFiles = maxAtticFiles;
    }
 
-   // Public --------------------------------------------------------
 
    public int getPoolSize() {
       return poolSize;
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalImpl.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalImpl.java
index c025c49..fccafc7 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalImpl.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalImpl.java
@@ -3453,9 +3453,6 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
       }
    }
 
-   // Inner classes
-   // ---------------------------------------------------------------------------
-
    // Used on Load
    private static final class TransactionHolder {
 
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/SyncIOCompletion.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/SyncIOCompletion.java
index b5123d8..26c0f4f 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/SyncIOCompletion.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/SyncIOCompletion.java
@@ -24,16 +24,7 @@ import org.apache.activemq.artemis.core.journal.IOCompletion;
 public abstract class SyncIOCompletion implements IOCompletion {
 
 
-   // Public --------------------------------------------------------
 
    public abstract void waitCompletion() throws Exception;
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/dataformat/ByteArrayEncoding.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/dataformat/ByteArrayEncoding.java
index 2c6f083..a1681ce 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/dataformat/ByteArrayEncoding.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/dataformat/ByteArrayEncoding.java
@@ -27,7 +27,6 @@ public class ByteArrayEncoding implements EncodingSupport {
       this.data = data;
    }
 
-   // Public --------------------------------------------------------
 
    @Override
    public void decode(final ActiveMQBuffer buffer) {
diff --git a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompProtocolManager.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompProtocolManager.java
index 3549265..46e5eea 100644
--- a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompProtocolManager.java
+++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompProtocolManager.java
@@ -194,7 +194,6 @@ public class StompProtocolManager extends AbstractProtocolManager<StompFrame, St
       return null;
    }
 
-   // Public --------------------------------------------------------
 
    public boolean send(final StompConnection connection, final StompFrame frame) {
       if (invokeInterceptors(this.outgoingInterceptors, frame, connection) != null) {
@@ -342,7 +341,6 @@ public class StompProtocolManager extends AbstractProtocolManager<StompFrame, St
       transactedSessions.remove(txID);
       session.getCoreSession().rollback(false);
    }
-   // Inner classes -------------------------------------------------
 
    public StompPostReceiptFunction subscribe(StompConnection connection,
                                              String subscriptionID,
diff --git a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompUtils.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompUtils.java
index 636dde4..280d825 100644
--- a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompUtils.java
+++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompUtils.java
@@ -150,14 +150,5 @@ public class StompUtils {
       }
    }
 
-   // Public --------------------------------------------------------
-
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
 
 }
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAService.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAService.java
index 512f0a7..9a836b8 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAService.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAService.java
@@ -38,7 +38,6 @@ public class ActiveMQRAService {
       this.resourceAdapterObjectName = resourceAdapterObjectName;
    }
 
-   // Public --------------------------------------------------------
 
    public void stop() {
       try {
@@ -57,12 +56,4 @@ public class ActiveMQRAService {
       }
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java
index 9bd6be8..4abd5a8 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java
@@ -372,8 +372,6 @@ public class ConfigurationImpl implements Configuration, Serializable {
     */
    private File artemisInstance;
 
-   // Public -------------------------------------------------------------------------
-
    @Override
    public String getJournalRetentionDirectory() {
       return journalRetentionDirectory;
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/filter/impl/FilterImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/filter/impl/FilterImpl.java
index 82c297b..2dc6e85 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/filter/impl/FilterImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/filter/impl/FilterImpl.java
@@ -156,8 +156,6 @@ public class FilterImpl implements Filter {
       return "FilterImpl [sfilterString=" + sfilterString + "]";
    }
 
-   // Private --------------------------------------------------------------------------
-
    private static Object getHeaderFieldValue(final Message msg, final SimpleString fieldName) {
       if (FilterConstants.ACTIVEMQ_USERID.equals(fieldName)) {
          if (msg.getUserID() == null) {
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AbstractControl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AbstractControl.java
index e0cdc90..cb319a2 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AbstractControl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AbstractControl.java
@@ -50,11 +50,8 @@ public abstract class AbstractControl extends StandardMBean {
       this.storageManager = storageManager;
    }
 
-   // Public --------------------------------------------------------
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
    protected void clearIO() {
       // the storage manager could be null on the backup on certain components
@@ -170,6 +167,6 @@ public abstract class AbstractControl extends StandardMBean {
          }
       }
    }
-   // Inner classes------------------------------------------------
+
 
 }
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AcceptorControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AcceptorControlImpl.java
index f4a9618..dd1ebd5 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AcceptorControlImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AcceptorControlImpl.java
@@ -152,14 +152,5 @@ public class AcceptorControlImpl extends AbstractControl implements AcceptorCont
       return MBeanInfoHelper.getMBeanAttributesInfo(AcceptorControl.class);
    }
 
-   // Public --------------------------------------------------------
-
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
 
 }
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
index d178b00..dbc7216 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
@@ -4136,11 +4136,8 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
       return new MBeanNotificationInfo[]{new MBeanNotificationInfo(names, this.getClass().getName(), "Notifications emitted by a Core Server")};
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
-   // Private -------------------------------------------------------
 
    private synchronized void setMessageCounterEnabled(final boolean enable) {
       if (isStarted()) {
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AddressControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AddressControlImpl.java
index d9605b3..b2f5209 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AddressControlImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AddressControlImpl.java
@@ -87,7 +87,6 @@ public class AddressControlImpl extends AbstractControl implements AddressContro
       this.managementService = managementService;
    }
 
-   // Public --------------------------------------------------------
 
    // AddressControlMBean implementation ----------------------------
 
@@ -587,7 +586,6 @@ public class AddressControlImpl extends AbstractControl implements AddressContro
       server.replay(startScanDate, endScanDate, this.getAddress(), target, filter);
    }
 
-   // Private -------------------------------------------------------
 
    private long getMessageCount(final DurabilityType durability) {
       List<QueueControl> queues = getQueues(durability);
@@ -625,7 +623,6 @@ public class AddressControlImpl extends AbstractControl implements AddressContro
       }
    }
 
-   // Inner classes -------------------------------------------------
 
    private enum DurabilityType {
       ALL, DURABLE, NON_DURABLE
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/BaseBroadcastGroupControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/BaseBroadcastGroupControlImpl.java
index ab65d9e..e393b35 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/BaseBroadcastGroupControlImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/BaseBroadcastGroupControlImpl.java
@@ -166,14 +166,5 @@ public class BaseBroadcastGroupControlImpl extends AbstractControl implements Ba
       return broadcastGroup;
    }
 
-   // Public --------------------------------------------------------
-
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
 
 }
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/BridgeControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/BridgeControlImpl.java
index 06fd5a4..2bace39 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/BridgeControlImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/BridgeControlImpl.java
@@ -327,14 +327,5 @@ public class BridgeControlImpl extends AbstractControl implements BridgeControl
       }
    }
 
-   // Public --------------------------------------------------------
-
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
 
 }
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/BroadcastGroupControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/BroadcastGroupControlImpl.java
index 5141a99..7d46737 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/BroadcastGroupControlImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/BroadcastGroupControlImpl.java
@@ -83,14 +83,5 @@ public class BroadcastGroupControlImpl extends BaseBroadcastGroupControlImpl imp
    // MessagingComponentControlMBean implementation -----------------
 
 
-   // Public --------------------------------------------------------
-
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
 
 }
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ClusterConnectionControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ClusterConnectionControlImpl.java
index dd3a716..fbac15e 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ClusterConnectionControlImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ClusterConnectionControlImpl.java
@@ -321,14 +321,5 @@ public class ClusterConnectionControlImpl extends AbstractControl implements Clu
 
    }
 
-   // Public --------------------------------------------------------
-
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
 
 }
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/DivertControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/DivertControlImpl.java
index 21b95a3..f700752 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/DivertControlImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/DivertControlImpl.java
@@ -198,14 +198,5 @@ public class DivertControlImpl extends AbstractControl implements DivertControl
       return MBeanInfoHelper.getMBeanAttributesInfo(DivertControl.class);
    }
 
-   // Public --------------------------------------------------------
-
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
 
 }
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/JGroupsChannelBroadcastGroupControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/JGroupsChannelBroadcastGroupControlImpl.java
index f72ee95..fae642e 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/JGroupsChannelBroadcastGroupControlImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/JGroupsChannelBroadcastGroupControlImpl.java
@@ -46,14 +46,5 @@ public class JGroupsChannelBroadcastGroupControlImpl extends BaseBroadcastGroupC
       return endpointFactory.getChannelName();
    }
 
-   // Public --------------------------------------------------------
-
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
 
 }
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/JGroupsFileBroadcastGroupControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/JGroupsFileBroadcastGroupControlImpl.java
index 8432618..e168fec 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/JGroupsFileBroadcastGroupControlImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/JGroupsFileBroadcastGroupControlImpl.java
@@ -71,14 +71,5 @@ public class JGroupsFileBroadcastGroupControlImpl extends BaseBroadcastGroupCont
       return endpointFactory.getFile();
    }
 
-   // Public --------------------------------------------------------
-
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
 
 }
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/JGroupsPropertiesBroadcastGroupControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/JGroupsPropertiesBroadcastGroupControlImpl.java
index 4f9dd9f..0c97fb4 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/JGroupsPropertiesBroadcastGroupControlImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/JGroupsPropertiesBroadcastGroupControlImpl.java
@@ -52,14 +52,5 @@ public class JGroupsPropertiesBroadcastGroupControlImpl extends BaseBroadcastGro
       return endpointFactory.getProperties();
    }
 
-   // Public --------------------------------------------------------
-
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
 
 }
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/MBeanInfoHelper.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/MBeanInfoHelper.java
index 19a11cc..900951e 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/MBeanInfoHelper.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/MBeanInfoHelper.java
@@ -31,7 +31,6 @@ import org.apache.activemq.artemis.api.core.management.Parameter;
 public class MBeanInfoHelper {
 
 
-   // Public --------------------------------------------------------
 
    public static MBeanOperationInfo[] getMBeanOperationsInfo(final Class mbeanInterface) {
       List<MBeanOperationInfo> operations = new ArrayList<>();
@@ -75,11 +74,8 @@ public class MBeanInfoHelper {
       return finalAttributes.toArray(new MBeanAttributeInfo[finalAttributes.size()]);
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
-   // Private -------------------------------------------------------
 
    private static boolean isGetterMethod(final Method method) {
       if (!method.getName().equals("get") && method.getName().startsWith("get") &&
@@ -176,5 +172,4 @@ public class MBeanInfoHelper {
       return paramsInfo;
    }
 
-   // Inner classes -------------------------------------------------
 }
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java
index 00f2780..62008af 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java
@@ -122,7 +122,6 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
       this.addressSettingsRepository = addressSettingsRepository;
    }
 
-   // Public --------------------------------------------------------
 
    public void setMessageCounter(final MessageCounter counter) {
       this.counter = counter;
@@ -1972,11 +1971,8 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
       }
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
-   // Private -------------------------------------------------------
 
    private void checkStarted() {
       if (!server.getPostOffice().isStarted()) {
@@ -1984,5 +1980,4 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
       }
    }
 
-   // Inner classes -------------------------------------------------
 }
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/messagecounter/MessageCounter.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/messagecounter/MessageCounter.java
index ad56455..8e0b6f4 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/messagecounter/MessageCounter.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/messagecounter/MessageCounter.java
@@ -139,7 +139,6 @@ public class MessageCounter {
       }
    };
 
-   // Public --------------------------------------------------------
 
    /*
     * This method is called periodically to update statistics from the queue
@@ -351,11 +350,8 @@ public class MessageCounter {
          .toString();
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
-   // Private -------------------------------------------------------
 
    /**
     * Update message counter history
@@ -427,7 +423,6 @@ public class MessageCounter {
       }
    }
 
-   // Inner classes -------------------------------------------------
 
    /**
     * Internal day counter class for one day hour based counter history
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/messagecounter/impl/MessageCounterHelper.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/messagecounter/impl/MessageCounterHelper.java
index dcdf7d5..22103f5 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/messagecounter/impl/MessageCounterHelper.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/messagecounter/impl/MessageCounterHelper.java
@@ -173,13 +173,6 @@ public class MessageCounterHelper {
       }
    }
 
-   // Public --------------------------------------------------------
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
 }
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageCursorProviderImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageCursorProviderImpl.java
index 74008fc..6bbc466 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageCursorProviderImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageCursorProviderImpl.java
@@ -115,7 +115,6 @@ public class PageCursorProviderImpl implements PageCursorProvider {
       this.inProgressReadPages = new LongObjectHashMap<>();
    }
 
-   // Public --------------------------------------------------------
 
    @Override
    public synchronized PageSubscription createSubscription(long cursorID, Filter filter, boolean persistent) {
@@ -699,6 +698,5 @@ public class PageCursorProviderImpl implements PageCursorProvider {
       }
    }
 
-   // Inner classes -------------------------------------------------
 
 }
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionImpl.java
index 5178096..b99015d 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionImpl.java
@@ -290,7 +290,6 @@ public final class PageSubscriptionImpl implements PageSubscription {
       this.counter = new PageSubscriptionCounterImpl(store, this, executor, persistent, cursorId);
    }
 
-   // Public --------------------------------------------------------
 
    @Override
    public PagingStore getPagingStore() {
@@ -1038,9 +1037,7 @@ public final class PageSubscriptionImpl implements PageSubscription {
       }
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
    private boolean match(final Message message) {
       if (filter == null) {
@@ -1050,7 +1047,6 @@ public final class PageSubscriptionImpl implements PageSubscription {
       }
    }
 
-   // Private -------------------------------------------------------
 
    // To be called only after the ACK has been processed and guaranteed to be on storage
    // The only exception is on non storage events such as not matching messages
@@ -1151,7 +1147,6 @@ public final class PageSubscriptionImpl implements PageSubscription {
       }
    }
 
-   // Inner classes -------------------------------------------------
 
    /**
     * This will hold information about the pending ACKs towards a page.
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PageSyncTimer.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PageSyncTimer.java
index 0fc5d65..6c9b85c 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PageSyncTimer.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PageSyncTimer.java
@@ -59,7 +59,6 @@ final class PageSyncTimer extends ActiveMQScheduledComponent {
       this.timeSync = timeSync;
    }
 
-   // Public --------------------------------------------------------
 
    synchronized void addSync(OperationContext ctx) {
       ctx.pageSyncLineUp();
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PageTransactionInfoImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PageTransactionInfoImpl.java
index 0281a29..13a9a30 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PageTransactionInfoImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PageTransactionInfoImpl.java
@@ -71,7 +71,6 @@ public final class PageTransactionInfoImpl implements PageTransactionInfo {
    public PageTransactionInfoImpl() {
    }
 
-   // Public --------------------------------------------------------
 
    @Override
    public long getRecordID() {
@@ -295,14 +294,6 @@ public final class PageTransactionInfoImpl implements PageTransactionInfo {
       }
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
    /**
     * a Message shouldn't be delivered until it's committed
     * For that reason the page-reference will be written right away
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreFactoryDatabase.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreFactoryDatabase.java
index 068b7ae..7336ac0 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreFactoryDatabase.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreFactoryDatabase.java
@@ -139,7 +139,6 @@ public class PagingStoreFactoryDatabase implements PagingStoreFactory {
          started = true;
       }
    }
-   // Public --------------------------------------------------------
 
    @Override
    public synchronized void stop() {
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreFactoryNIO.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreFactoryNIO.java
index 2d0f24c..1e70fd2 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreFactoryNIO.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreFactoryNIO.java
@@ -132,7 +132,6 @@ public class PagingStoreFactoryNIO implements PagingStoreFactory {
       this.readWholePage = readWholePage;
    }
 
-   // Public --------------------------------------------------------
 
    @Override
    public ScheduledExecutorService getScheduledExecutor() {
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreImpl.java
index bec3f54..3133096 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreImpl.java
@@ -1200,5 +1200,4 @@ public class PagingStoreImpl implements PagingStore {
       }
    }
 
-   // Inner classes -------------------------------------------------
 }
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/config/PersistedAddressSetting.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/config/PersistedAddressSetting.java
index 7081a26..6a5b877 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/config/PersistedAddressSetting.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/config/PersistedAddressSetting.java
@@ -58,7 +58,6 @@ public class PersistedAddressSetting implements EncodingSupport {
       this.setting = setting;
    }
 
-   // Public --------------------------------------------------------
 
    public void setStoreId(long id) {
       this.storeId = id;
@@ -102,12 +101,4 @@ public class PersistedAddressSetting implements EncodingSupport {
       return addressMatch.sizeof() + setting.getEncodeSize();
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/config/PersistedSecuritySetting.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/config/PersistedSecuritySetting.java
index f2c371b..d17de9e 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/config/PersistedSecuritySetting.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/config/PersistedSecuritySetting.java
@@ -92,7 +92,6 @@ public class PersistedSecuritySetting implements EncodingSupport {
       this.deleteAddressRoles = SimpleString.toSimpleString(deleteAddressRoles);
    }
 
-   // Public --------------------------------------------------------
 
    public long getStoreId() {
       return storeId;
@@ -353,12 +352,4 @@ public class PersistedSecuritySetting implements EncodingSupport {
          "]";
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java
index 314982e..10c3399 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java
@@ -1668,8 +1668,6 @@ public abstract class AbstractJournalStorageManager extends CriticalComponentImp
       }
    }
 
-   // Public -----------------------------------------------------------------------------------
-
    @Override
    public Journal getMessageJournal() {
       return messageJournal;
@@ -1680,8 +1678,6 @@ public abstract class AbstractJournalStorageManager extends CriticalComponentImp
       return bindingsJournal;
    }
 
-   // Package protected ---------------------------------------------
-
    protected void confirmLargeMessage(final LargeServerMessage largeServerMessage) {
       synchronized (largeServerMessage) {
          if (largeServerMessage.getPendingRecordID() >= 0) {
@@ -1905,8 +1901,6 @@ public abstract class AbstractJournalStorageManager extends CriticalComponentImp
       }
    }
 
-   // Inner Classes
-   // ----------------------------------------------------------------------------
 
    private static final class DummyOperationContext implements OperationContext {
 
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/BatchingIDGenerator.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/BatchingIDGenerator.java
index 694cb2a..52c7bd2 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/BatchingIDGenerator.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/BatchingIDGenerator.java
@@ -162,7 +162,6 @@ public final class BatchingIDGenerator implements IDGenerator {
       return new IDCounterEncoding(id);
    }
 
-   // Inner classes -------------------------------------------------
 
    protected static final class IDCounterEncoding implements EncodingSupport {
 
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/BufferSplitter.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/BufferSplitter.java
index 4b69101..e8db7f1 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/BufferSplitter.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/BufferSplitter.java
@@ -55,7 +55,6 @@ public class BufferSplitter {
          this.length = length;
       }
 
-      // Public --------------------------------------------------------
 
       @Override
       public void decode(final ActiveMQBuffer buffer) {
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java
index ba15fc7..d1db386 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java
@@ -1452,8 +1452,6 @@ public class PostOfficeImpl implements PostOffice, NotificationListener, Binding
       return "PostOfficeImpl [server=" + server + "]";
    }
 
-   // Private -----------------------------------------------------------------
-
    private void routeQueueInfo(final Message message, final Queue queue, final boolean applyFilters) throws Exception {
       if (!applyFilters || queue.getFilter() == null || queue.getFilter().match(message)) {
          RoutingContext context = new RoutingContextImpl(null);
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/NodeAnnounceMessage.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/NodeAnnounceMessage.java
index da16d50..e23ea2e 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/NodeAnnounceMessage.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/NodeAnnounceMessage.java
@@ -70,7 +70,6 @@ public class NodeAnnounceMessage extends PacketImpl {
       super(nodeAnnounceMessage_V2);
    }
 
-   // Public --------------------------------------------------------
 
    public String getNodeID() {
       return nodeID;
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationAddMessage.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationAddMessage.java
index 90e4263..c85cc84 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationAddMessage.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationAddMessage.java
@@ -62,7 +62,6 @@ public final class ReplicationAddMessage extends PacketImpl {
       this.encodingData = encodingData;
    }
 
-   // Public --------------------------------------------------------
 
    @Override
    public int expectedEncodeSize() {
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationAddTXMessage.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationAddTXMessage.java
index 0ed85b6..73a35d4 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationAddTXMessage.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationAddTXMessage.java
@@ -66,7 +66,6 @@ public class ReplicationAddTXMessage extends PacketImpl {
       this.persister = persister;
    }
 
-   // Public --------------------------------------------------------
 
    @Override
    public int expectedEncodeSize() {
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationPageWriteMessage.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationPageWriteMessage.java
index df43c14..9097bf4 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationPageWriteMessage.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationPageWriteMessage.java
@@ -39,7 +39,6 @@ public class ReplicationPageWriteMessage extends PacketImpl implements MessagePa
       this.pagedMessage = pagedMessage;
    }
 
-   // Public --------------------------------------------------------
 
    @Override
    public int expectedEncodeSize() {
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationPrepareMessage.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationPrepareMessage.java
index cf993a3..32e7980 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationPrepareMessage.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationPrepareMessage.java
@@ -47,7 +47,6 @@ public final class ReplicationPrepareMessage extends PacketImpl {
       this.encodingData = encodingData;
    }
 
-   // Public --------------------------------------------------------
 
    @Override
    public int expectedEncodeSize() {
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyAcceptor.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyAcceptor.java
index 22df7d0..9e19fc5 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyAcceptor.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyAcceptor.java
@@ -890,8 +890,6 @@ public class NettyAcceptor extends AbstractAcceptor {
       return String.join(",", protocolManagers.keySet());
    }
 
-   // Inner classes -----------------------------------------------------------------------------
-
    private final class ActiveMQServerChannelHandler extends ActiveMQChannelHandler implements ConnectionCreator {
 
       ActiveMQServerChannelHandler(final ChannelGroup group,
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/server/impl/RemotingServiceImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/server/impl/RemotingServiceImpl.java
index 0a42f1b..98a9b38 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/server/impl/RemotingServiceImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/server/impl/RemotingServiceImpl.java
@@ -670,7 +670,6 @@ public class RemotingServiceImpl implements RemotingService, ServerConnectionLif
       return clusterConnection;
    }
 
-   // Inner classes -------------------------------------------------
 
    private final class DelegatingBufferHandler implements BufferHandler {
 
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationEndpoint.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationEndpoint.java
index 9e2984b..d9ffe99 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationEndpoint.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationEndpoint.java
@@ -153,7 +153,6 @@ public final class ReplicationEndpoint implements ChannelHandler, ActiveMQCompon
       this.supportResponseBatching = false;
    }
 
-   // Public --------------------------------------------------------
 
    public synchronized void registerJournal(final byte id, final Journal journal) {
       if (journals == null || id >= journals.length) {
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationManager.java
index 7be1e17..73006ef 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationManager.java
@@ -616,7 +616,6 @@ public final class ReplicationManager implements ActiveMQComponent {
       ctx.replicationDone();
    }
 
-   // Inner classes -------------------------------------------------
 
    private final class ReplicatedSessionFailureListener implements SessionFailureListener {
 
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java
index 4fca439..a737086 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java
@@ -1124,7 +1124,6 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
    }
 
 
-   // Inner classes -------------------------------------------------
 
    protected void scheduleRetryConnectFixedTimeout(final long milliseconds) {
       try {
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionImpl.java
index 8820885..64939ad 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionImpl.java
@@ -922,8 +922,6 @@ public final class ClusterConnectionImpl implements ClusterConnection, AfterConn
       }
    }
 
-   // Inner classes -----------------------------------------------------------------------------------
-
    private class MessageFlowRecordImpl implements MessageFlowRecord {
 
       private BridgeImpl bridge;
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
index 89fcbeb..9cfbd34 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
@@ -2895,8 +2895,6 @@ public class ActiveMQServerImpl implements ActiveMQServer {
       return sessions.get(sessionName);
    }
 
-   // PUBLIC -------
-
    @Override
    public String toString() {
       if (identity != null) {
@@ -4154,9 +4152,6 @@ public class ActiveMQServerImpl implements ActiveMQServer {
       }
    }
 
-   // Inner classes
-   // --------------------------------------------------------------------------------
-
    public final class DefaultCriticalErrorListener implements IOCriticalErrorListener {
 
       private final AtomicBoolean failedAlready = new AtomicBoolean();
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
index 6eb4e3f..90d43e5 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
@@ -4124,9 +4124,6 @@ public class QueueImpl extends CriticalComponentImpl implements Queue {
          .setAutoCreated(autoCreated);
    }
 
-   // Inner classes
-   // --------------------------------------------------------------------------
-
    protected static class ConsumerHolder<T extends Consumer> implements PriorityAware {
 
       ConsumerHolder(final T consumer) {
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java
index 0bd382f..18b90fb 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java
@@ -1132,7 +1132,6 @@ public class ServerConsumerImpl implements ServerConsumer, ReadyListener {
       return BigDecimal.valueOf((acks - messageConsumedSnapshot.getAndSet(acks)) / timeSlice).setScale(2, BigDecimal.ROUND_UP).floatValue();
    }
 
-   // Private --------------------------------------------------------------------------------------
 
    @Override
    public void promptDelivery() {
@@ -1199,9 +1198,6 @@ public class ServerConsumerImpl implements ServerConsumer, ReadyListener {
       }
    }
 
-   // Inner classes
-   // ------------------------------------------------------------------------
-
    private final Runnable resumeLargeMessageRunnable = new Runnable() {
       @Override
       public void run() {
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerInfo.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerInfo.java
index 84ce874..72ad1a1 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerInfo.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerInfo.java
@@ -37,7 +37,6 @@ public class ServerInfo {
       this.pagingManager = pagingManager;
    }
 
-   // Public --------------------------------------------------------
 
    public String dump() {
       long maxMemory = Runtime.getRuntime().maxMemory();
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/impl/ManagementServiceImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/impl/ManagementServiceImpl.java
index 137c7cf..ce474dd 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/impl/ManagementServiceImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/impl/ManagementServiceImpl.java
@@ -171,7 +171,6 @@ public class ManagementServiceImpl implements ManagementService {
       objectNameBuilder = ObjectNameBuilder.create(configuration.getJMXDomain(), configuration.getName(), configuration.isJMXUseBrokerName());
    }
 
-   // Public --------------------------------------------------------
 
    // ManagementService implementation -------------------------
 
@@ -951,5 +950,4 @@ public class ManagementServiceImpl implements ManagementService {
       return correlationId;
    }
 
-   // Inner classes -------------------------------------------------
 }
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/ActiveMQSecurityManagerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/ActiveMQSecurityManagerImpl.java
index 4aff8e2..54f23bc 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/ActiveMQSecurityManagerImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/ActiveMQSecurityManagerImpl.java
@@ -44,7 +44,7 @@ public class ActiveMQSecurityManagerImpl implements ActiveMQSecurityManager {
       this.configuration = configuration;
    }
 
-   // Public ---------------------------------------------------------------------
+
 
    @Override
    public boolean validateUser(final String username, final String password) {
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/ValidatorsTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/ValidatorsTest.java
index cc81e52..6166e07 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/ValidatorsTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/ValidatorsTest.java
@@ -37,7 +37,6 @@ public class ValidatorsTest extends Assert {
    }
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testGE_ZERO() throws Exception {
@@ -142,12 +141,4 @@ public class ValidatorsTest extends Assert {
       ValidatorsTest.failure(Validators.MINUS_ONE_OR_POSITIVE_INT, Integer.MAX_VALUE + 1);
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/filter/impl/FilterTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/filter/impl/FilterTest.java
index 1eb749b..6775230 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/filter/impl/FilterTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/filter/impl/FilterTest.java
@@ -694,8 +694,6 @@ public class FilterTest extends SilentTestCase {
    //      parse.getNextToken();
    //   }
 
-   // Private -----------------------------------------------------------------------------------
-
    private void doPutStringProperty(final String key, final String value) {
       message.putStringProperty(new SimpleString(key), new SimpleString(value));
    }
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/persistence/impl/journal/OperationContextUnitTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/persistence/impl/journal/OperationContextUnitTest.java
index 830d159..02876f9 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/persistence/impl/journal/OperationContextUnitTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/persistence/impl/journal/OperationContextUnitTest.java
@@ -422,12 +422,4 @@ public class OperationContextUnitTest extends ActiveMQTestBase {
       Assert.assertEquals(0, operations.get());
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/security/RoleTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/security/RoleTest.java
index a38e125..46d0387 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/security/RoleTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/security/RoleTest.java
@@ -32,7 +32,6 @@ import static org.apache.activemq.artemis.core.security.CheckType.SEND;
 public class RoleTest extends Assert {
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testWriteRole() throws Exception {
@@ -119,11 +118,5 @@ public class RoleTest extends Assert {
       Assert.assertFalse(role.equals(null));
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
 }
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/version/impl/VersionImplTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/version/impl/VersionImplTest.java
index 92e38a2..8dd9818 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/version/impl/VersionImplTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/version/impl/VersionImplTest.java
@@ -26,7 +26,6 @@ import org.junit.Test;
 
 public class VersionImplTest extends Assert {
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testVersionImpl() throws Exception {
@@ -74,11 +73,5 @@ public class VersionImplTest extends Assert {
       Assert.assertTrue(version.equals(version2));
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
 }
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
index f9a43b3..7887458 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
@@ -2572,9 +2572,7 @@ public abstract class ActiveMQTestBase extends Assert {
       return null;
    }
 
-   // Private -------------------------------------------------------
 
-   // Inner classes -------------------------------------------------
 
    protected interface ActiveMQAction {
 
diff --git a/examples/features/standard/queue-requestor/src/main/java/org/apache/activemq/artemis/jms/example/TextReverserService.java b/examples/features/standard/queue-requestor/src/main/java/org/apache/activemq/artemis/jms/example/TextReverserService.java
index 14832a3..1753430 100644
--- a/examples/features/standard/queue-requestor/src/main/java/org/apache/activemq/artemis/jms/example/TextReverserService.java
+++ b/examples/features/standard/queue-requestor/src/main/java/org/apache/activemq/artemis/jms/example/TextReverserService.java
@@ -81,7 +81,6 @@ public class TextReverserService implements MessageListener {
       }
    }
 
-   // Public --------------------------------------------------------
 
    public void close() {
       if (connection != null) {
@@ -94,12 +93,4 @@ public class TextReverserService implements MessageListener {
       }
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/examples/features/standard/xa-heuristic/src/main/java/org/apache/activemq/artemis/jms/example/DummyXid.java b/examples/features/standard/xa-heuristic/src/main/java/org/apache/activemq/artemis/jms/example/DummyXid.java
index 62315d3..5321b88 100644
--- a/examples/features/standard/xa-heuristic/src/main/java/org/apache/activemq/artemis/jms/example/DummyXid.java
+++ b/examples/features/standard/xa-heuristic/src/main/java/org/apache/activemq/artemis/jms/example/DummyXid.java
@@ -98,7 +98,7 @@ public class DummyXid implements Xid {
       return globalTransactionId;
    }
 
-   // Public -------------------------------------------------------------------------------
+----------
 
    @Override
    public int hashCode() {
@@ -152,7 +152,6 @@ public class DummyXid implements Xid {
          stringRep(globalTransactionId);
    }
 
-   // Private -------------------------------------------------------------------------------
 
    private String stringRep(final byte[] bytes) {
       StringBuilder buff = new StringBuilder();
diff --git a/examples/features/standard/xa-receive/src/main/java/org/apache/activemq/artemis/jms/example/DummyXid.java b/examples/features/standard/xa-receive/src/main/java/org/apache/activemq/artemis/jms/example/DummyXid.java
index 194e7ae..aa23863 100644
--- a/examples/features/standard/xa-receive/src/main/java/org/apache/activemq/artemis/jms/example/DummyXid.java
+++ b/examples/features/standard/xa-receive/src/main/java/org/apache/activemq/artemis/jms/example/DummyXid.java
@@ -99,7 +99,7 @@ public class DummyXid implements Xid {
       return globalTransactionId;
    }
 
-   // Public -------------------------------------------------------------------------------
+----------
 
    @Override
    public int hashCode() {
@@ -153,7 +153,6 @@ public class DummyXid implements Xid {
          stringRep(globalTransactionId);
    }
 
-   // Private -------------------------------------------------------------------------------
 
    private String stringRep(final byte[] bytes) {
       StringBuilder buff = new StringBuilder();
diff --git a/examples/features/standard/xa-send/src/main/java/org/apache/activemq/artemis/jms/example/DummyXid.java b/examples/features/standard/xa-send/src/main/java/org/apache/activemq/artemis/jms/example/DummyXid.java
index 32c6aca..7e35ce2 100644
--- a/examples/features/standard/xa-send/src/main/java/org/apache/activemq/artemis/jms/example/DummyXid.java
+++ b/examples/features/standard/xa-send/src/main/java/org/apache/activemq/artemis/jms/example/DummyXid.java
@@ -96,7 +96,7 @@ public class DummyXid implements Xid {
       return globalTransactionId;
    }
 
-   // Public -------------------------------------------------------------------------------
+----------
 
    @Override
    public int hashCode() {
@@ -150,7 +150,6 @@ public class DummyXid implements Xid {
          stringRep(globalTransactionId);
    }
 
-   // Private -------------------------------------------------------------------------------
 
    private String stringRep(final byte[] bytes) {
       StringBuilder buff = new StringBuilder();
diff --git a/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/artemiswrapper/InVMNameParser.java b/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/artemiswrapper/InVMNameParser.java
index 62149d3..881497f 100644
--- a/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/artemiswrapper/InVMNameParser.java
+++ b/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/artemiswrapper/InVMNameParser.java
@@ -41,7 +41,6 @@ public class InVMNameParser implements NameParser, Serializable {
    }
 
 
-   // Public --------------------------------------------------------
 
    public static Properties getSyntax() {
       return InVMNameParser.syntax;
@@ -52,12 +51,4 @@ public class InVMNameParser implements NameParser, Serializable {
       return new CompoundName(name, InVMNameParser.syntax);
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/artemiswrapper/InVMNamingContext.java b/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/artemiswrapper/InVMNamingContext.java
index 88eba94..ac3fb33 100644
--- a/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/artemiswrapper/InVMNamingContext.java
+++ b/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/artemiswrapper/InVMNamingContext.java
@@ -258,13 +258,9 @@ public class InVMNamingContext implements Context, Serializable {
       return nameInNamespace;
    }
 
-   // Public --------------------------------------------------------
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
-   // Private -------------------------------------------------------
 
    private String trimSlashes(String s) {
       int i = 0;
@@ -300,7 +296,6 @@ public class InVMNamingContext implements Context, Serializable {
       c.map.put(name, obj);
    }
 
-   // Inner classes -------------------------------------------------
 
    private class NamingEnumerationImpl<T> implements NamingEnumeration<T> {
 
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/perf/NetworkedSyncTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/perf/NetworkedSyncTest.java
index c057083..129d5a8 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/perf/NetworkedSyncTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/perf/NetworkedSyncTest.java
@@ -40,7 +40,6 @@ import org.springframework.core.io.ClassPathResource;
 
 public class NetworkedSyncTest extends TestCase {
 
-   // constants
    public static final int MESSAGE_COUNT = 10000; //100000;
    public final static String config = "org/apache/activemq/perf/networkSync.xml";
    public final static String broker1URL = "tcp://localhost:61616";
diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/BridgeTestBase.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/BridgeTestBase.java
index 9721f45..b9e4172 100644
--- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/BridgeTestBase.java
+++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/BridgeTestBase.java
@@ -485,5 +485,4 @@ public abstract class BridgeTestBase extends ActiveMQTestBase {
       return new TransactionManagerImple();
    }
 
-   // Inner classes -------------------------------------------------------------------
 }
diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/JMSBridgeTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/JMSBridgeTest.java
index e42a8d7..6af04ef 100644
--- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/JMSBridgeTest.java
+++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/JMSBridgeTest.java
@@ -1390,7 +1390,6 @@ public class JMSBridgeTest extends BridgeTestBase {
       server0.stop();
    }
 
-   // Private -------------------------------------------------------------------------------
 
    private void testStress(final QualityOfServiceMode qosMode,
                            final boolean persistent,
@@ -1998,8 +1997,6 @@ public class JMSBridgeTest extends BridgeTestBase {
 
    }
 
-   // Inner classes -------------------------------------------------------------------
-
    private static class StressSender implements Runnable {
 
       int numMessages;
diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/xa/JMSXDeliveryCountTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/xa/JMSXDeliveryCountTest.java
index 1b2d9fd..bfed879 100644
--- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/xa/JMSXDeliveryCountTest.java
+++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/xa/JMSXDeliveryCountTest.java
@@ -678,14 +678,7 @@ public class JMSXDeliveryCountTest extends JMSTestBase {
       }
    }
 
-   // Package protected ----------------------------------------------------------------------------
-
-   // Protected ------------------------------------------------------------------------------------
-
-   // Private --------------------------------------------------------------------------------------
-
-   // Inner classes --------------------------------------------------------------------------------
-
+ 
    static class DummyXAResource implements XAResource {
 
       DummyXAResource() {
diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/xa/XATest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/xa/XATest.java
index 55dad55..80183d5 100644
--- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/xa/XATest.java
+++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/xa/XATest.java
@@ -109,7 +109,6 @@ public class XATest extends JMSTestBase {
 
    }
 
-   // Public --------------------------------------------------------
 
    @Test
    public void test2PCSendCommit1PCOptimization() throws Exception {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/SimpleNotificationService.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/SimpleNotificationService.java
index ae9e4d6..1d2551d 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/SimpleNotificationService.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/SimpleNotificationService.java
@@ -52,15 +52,6 @@ public class SimpleNotificationService implements NotificationService {
       }
    }
 
-   // Public --------------------------------------------------------
-
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
 
    public static class Listener implements NotificationListener {
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/String64KLimitTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/String64KLimitTest.java
index d14f3d8..69528b1 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/String64KLimitTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/String64KLimitTest.java
@@ -50,7 +50,6 @@ public class String64KLimitTest extends ActiveMQTestBase {
    private ServerLocator locator;
 
 
-   // Public --------------------------------------------------------
 
    protected String genString(final int len) {
       char[] chars = new char[len];
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/BlockingSendTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/BlockingSendTest.java
index adb4deb..88f3dfe 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/BlockingSendTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/BlockingSendTest.java
@@ -32,7 +32,6 @@ import org.junit.Test;
 public class BlockingSendTest extends ActiveMQTestBase {
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testSinglePersistentBlockingNonSync() throws Exception {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerCloseTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerCloseTest.java
index cadf0d4..fe7ac3b 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerCloseTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerCloseTest.java
@@ -55,7 +55,6 @@ public class ConsumerCloseTest extends ActiveMQTestBase {
 
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testCanNotUseAClosedConsumer() throws Exception {
@@ -261,9 +260,7 @@ public class ConsumerCloseTest extends ActiveMQTestBase {
 
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
    @Override
    @Before
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/CreateQueueIdempotentTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/CreateQueueIdempotentTest.java
index cd69c36..f896336 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/CreateQueueIdempotentTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/CreateQueueIdempotentTest.java
@@ -98,14 +98,6 @@ public class CreateQueueIdempotentTest extends ActiveMQTestBase {
       Assert.assertEquals(NUM_THREADS - 1, failedAttempts.intValue());
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
    class QueueCreator extends Thread {
 
       private String queueName = null;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/DurableQueueTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/DurableQueueTest.java
index 6338766..da738b8 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/DurableQueueTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/DurableQueueTest.java
@@ -44,7 +44,6 @@ public class DurableQueueTest extends ActiveMQTestBase {
    private ServerLocator locator;
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testConsumeFromDurableQueue() throws Exception {
@@ -142,9 +141,7 @@ public class DurableQueueTest extends ActiveMQTestBase {
       session.deleteQueue(queue);
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
    @Override
    @Before
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ExpireTestOnRestartTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ExpireTestOnRestartTest.java
index 2e40ab5..3a31c59 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ExpireTestOnRestartTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ExpireTestOnRestartTest.java
@@ -134,12 +134,4 @@ public class ExpireTestOnRestartTest extends ActiveMQTestBase {
       locator.close();
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ExpiryLargeMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ExpiryLargeMessageTest.java
index d95342e..c644281 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ExpiryLargeMessageTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ExpiryLargeMessageTest.java
@@ -61,7 +61,6 @@ public class ExpiryLargeMessageTest extends ActiveMQTestBase {
    final int numberOfMessages = 50;
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testExpiryMessagesThenDLQ() throws Exception {
@@ -458,12 +457,4 @@ public class ExpiryLargeMessageTest extends ActiveMQTestBase {
       session.close();
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/HeuristicXATest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/HeuristicXATest.java
index 2c7f419..2d1e22a 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/HeuristicXATest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/HeuristicXATest.java
@@ -51,7 +51,6 @@ public class HeuristicXATest extends ActiveMQTestBase {
 
    private ServerLocator locator;
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testInvalidCall() throws Exception {
@@ -402,9 +401,7 @@ public class HeuristicXATest extends ActiveMQTestBase {
       session.close();
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
    @Override
    @Before
@@ -414,8 +411,6 @@ public class HeuristicXATest extends ActiveMQTestBase {
       locator = createInVMNonHALocator();
    }
 
-   // Private -------------------------------------------------------
 
-   // Inner classes -------------------------------------------------
 
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/IncompatibleVersionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/IncompatibleVersionTest.java
index 8726ded..9ff2907 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/IncompatibleVersionTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/IncompatibleVersionTest.java
@@ -64,7 +64,6 @@ public class IncompatibleVersionTest extends SpawnedTestBase {
    private ServerLocator locator;
 
 
-   // Public --------------------------------------------------------
 
    @Override
    @Before
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JmsNettyNioStressTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JmsNettyNioStressTest.java
index 76ffbc1..1685c9e 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JmsNettyNioStressTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JmsNettyNioStressTest.java
@@ -71,7 +71,6 @@ import org.junit.Test;
 public class JmsNettyNioStressTest extends ActiveMQTestBase {
 
 
-   // Public --------------------------------------------------------
 
    // Remove this method to re-enable those tests
    @Test
@@ -284,12 +283,4 @@ public class JmsNettyNioStressTest extends ActiveMQTestBase {
 
       server.stop();
    }
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LargeMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LargeMessageTest.java
index b1b8bb0..55a62a5 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LargeMessageTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LargeMessageTest.java
@@ -2564,9 +2564,7 @@ public class LargeMessageTest extends LargeMessageTestBase {
       session.commit();
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
    @Override
    @Before
@@ -2795,8 +2793,6 @@ public class LargeMessageTest extends LargeMessageTestBase {
       Wait.assertTrue(() -> ((UnixOperatingSystemMXBean)os).getOpenFileDescriptorCount() - fdBefore < 3);
    }
 
-   // Private -------------------------------------------------------
 
-   // Inner classes -------------------------------------------------
 
 }
\ No newline at end of file
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LibaioDependencyCheckTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LibaioDependencyCheckTest.java
index 400c7ec..e70b159 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LibaioDependencyCheckTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LibaioDependencyCheckTest.java
@@ -29,7 +29,6 @@ import org.junit.Test;
 public class LibaioDependencyCheckTest extends ActiveMQTestBase {
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testDependency() throws Exception {
@@ -38,12 +37,4 @@ public class LibaioDependencyCheckTest extends ActiveMQTestBase {
       }
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageConsumerRollbackTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageConsumerRollbackTest.java
index 1dbe67d..b5db065 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageConsumerRollbackTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageConsumerRollbackTest.java
@@ -74,7 +74,6 @@ public class MessageConsumerRollbackTest extends ActiveMQTestBase {
    }
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testRollbackMultipleConsumers() throws Exception {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageDurabilityTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageDurabilityTest.java
index 4b94ebb..3919de2 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageDurabilityTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageDurabilityTest.java
@@ -45,7 +45,6 @@ public class MessageDurabilityTest extends ActiveMQTestBase {
    private ServerLocator locator;
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testNonDurableMessageOnNonDurableQueue() throws Exception {
@@ -168,9 +167,7 @@ public class MessageDurabilityTest extends ActiveMQTestBase {
       });
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
    @Override
    @Before
@@ -184,7 +181,6 @@ public class MessageDurabilityTest extends ActiveMQTestBase {
       session = addClientSession(sf.createSession(false, true, true));
    }
 
-   // Private -------------------------------------------------------
 
    private void restart() throws Exception {
       session.close();
@@ -195,6 +191,5 @@ public class MessageDurabilityTest extends ActiveMQTestBase {
       sf = createSessionFactory(locator);
       session = sf.createSession(false, true, true);
    }
-   // Inner classes -------------------------------------------------
 
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageExpirationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageExpirationTest.java
index e15abff..4e75fa3 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageExpirationTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageExpirationTest.java
@@ -279,9 +279,7 @@ public class MessageExpirationTest extends ActiveMQTestBase {
       session.deleteQueue(expiryQueue);
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
    @Override
    @Before
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessagePriorityTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessagePriorityTest.java
index f082534..2884770 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessagePriorityTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessagePriorityTest.java
@@ -47,7 +47,6 @@ public class MessagePriorityTest extends ActiveMQTestBase {
    private ClientSessionFactory sf;
    private ServerLocator locator;
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testMessagePriority() throws Exception {
@@ -296,9 +295,7 @@ public class MessagePriorityTest extends ActiveMQTestBase {
       session.close();
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
    @Override
    @Before
@@ -312,7 +309,6 @@ public class MessagePriorityTest extends ActiveMQTestBase {
       session = addClientSession(sf.createSession(false, true, true));
    }
 
-   // Private -------------------------------------------------------
 
    private static void expectMessage(final byte expectedPriority,
                                      final String expectedStringInBody,
@@ -323,6 +319,5 @@ public class MessagePriorityTest extends ActiveMQTestBase {
       Assert.assertEquals(expectedStringInBody, m.getBodyBuffer().readString());
    }
 
-   // Inner classes -------------------------------------------------
 
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageRateTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageRateTest.java
index 2bbbb10..d585fe8 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageRateTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageRateTest.java
@@ -43,7 +43,6 @@ public class MessageRateTest extends ActiveMQTestBase {
    private ServerLocator locator;
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testProduceRate() throws Exception {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MixRoutingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MixRoutingTest.java
index 75d671a..3eb60b3 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MixRoutingTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MixRoutingTest.java
@@ -45,7 +45,6 @@ public class MixRoutingTest extends SingleServerTestBase {
 
 
 
-   // Public --------------------------------------------------------
 
    @Override
    protected ActiveMQServer createServer() throws Exception {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MultipleThreadFilterOneTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MultipleThreadFilterOneTest.java
index ab1a6c2..dd6ca50 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MultipleThreadFilterOneTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MultipleThreadFilterOneTest.java
@@ -55,7 +55,6 @@ public class MultipleThreadFilterOneTest extends ActiveMQTestBase {
 
 
 
-   // Public --------------------------------------------------------
 
    class SomeProducer extends Thread {
 
@@ -264,12 +263,4 @@ public class MultipleThreadFilterOneTest extends ActiveMQTestBase {
       }
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NIOvsOIOTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NIOvsOIOTest.java
index b68464c..60c1629 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NIOvsOIOTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NIOvsOIOTest.java
@@ -49,7 +49,6 @@ public class NIOvsOIOTest extends ActiveMQTestBase {
    private static final Logger log = Logger.getLogger(NIOvsOIOTest.class);
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testNIOPerf() throws Exception {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NettyConsumerWindowSizeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NettyConsumerWindowSizeTest.java
index 22045ed..dd0e076 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NettyConsumerWindowSizeTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NettyConsumerWindowSizeTest.java
@@ -25,14 +25,5 @@ public class NettyConsumerWindowSizeTest extends ConsumerWindowSizeTest {
    }
 
 
-   // Public --------------------------------------------------------
-
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
 
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/OrderTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/OrderTest.java
index fa393c1..879d13b 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/OrderTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/OrderTest.java
@@ -61,7 +61,6 @@ public class OrderTest extends ActiveMQTestBase {
    }
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testSimpleStorage() throws Exception {
@@ -240,12 +239,4 @@ public class OrderTest extends ActiveMQTestBase {
       session.close();
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ProducerCloseTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ProducerCloseTest.java
index e6291bc..4018c48 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ProducerCloseTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ProducerCloseTest.java
@@ -55,9 +55,7 @@ public class ProducerCloseTest extends ActiveMQTestBase {
       });
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
    @Override
    @Before
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/RedeliveryConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/RedeliveryConsumerTest.java
index cb9fddb..f42eac6 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/RedeliveryConsumerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/RedeliveryConsumerTest.java
@@ -53,7 +53,6 @@ public class RedeliveryConsumerTest extends ActiveMQTestBase {
    private ServerLocator locator;
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testRedeliveryMessageStrict() throws Exception {
@@ -392,9 +391,7 @@ public class RedeliveryConsumerTest extends ActiveMQTestBase {
       factory.close();
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
    /**
     * @param persistDeliveryCountBeforeDelivery
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SelfExpandingBufferTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SelfExpandingBufferTest.java
index 9150e95..739f0ce 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SelfExpandingBufferTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SelfExpandingBufferTest.java
@@ -120,9 +120,7 @@ public class SelfExpandingBufferTest extends ActiveMQTestBase {
       }
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
    protected void setUpService(final boolean netty, final boolean persistent) throws Exception {
       service = createServer(persistent, createDefaultConfig(netty));
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCloseTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCloseTest.java
index 8d21f0f..59434af 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCloseTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCloseTest.java
@@ -47,7 +47,6 @@ public class SessionCloseTest extends ActiveMQTestBase {
 
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testCanNotUseAClosedSession() throws Exception {
@@ -218,9 +217,7 @@ public class SessionCloseTest extends ActiveMQTestBase {
 
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
    @Override
    @Before
@@ -232,8 +229,6 @@ public class SessionCloseTest extends ActiveMQTestBase {
       sf = createSessionFactory(locator);
    }
 
-   // Private -------------------------------------------------------
 
-   // Inner classes -------------------------------------------------
 
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/TemporaryQueueTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/TemporaryQueueTest.java
index 1d778a2..85dd151 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/TemporaryQueueTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/TemporaryQueueTest.java
@@ -604,7 +604,5 @@ public class TemporaryQueueTest extends SingleServerTestBase {
 
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientCrashTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientCrashTest.java
index 8f75f64..5935922 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientCrashTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientCrashTest.java
@@ -83,7 +83,6 @@ public class ClientCrashTest extends ClientTestBase {
    }
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testCrashClient() throws Exception {
@@ -172,8 +171,6 @@ public class ClientCrashTest extends ClientTestBase {
       session.close();
    }
 
-   // Package protected ---------------------------------------------
-
    @Override
    @Before
    public void setUp() throws Exception {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientExitTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientExitTest.java
index 5281301..c0719bd 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientExitTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientExitTest.java
@@ -45,14 +45,10 @@ public class ClientExitTest extends ClientTestBase {
 
    private static final Logger log = Logger.getLogger(ClientExitTest.class);
 
-
-
    private ClientSession session;
 
    private ClientConsumer consumer;
 
-   // Public ---------------------------------------------------------------------------------------
-
    @Test
    public void testGracefulClientExit() throws Exception {
       // spawn a JVM that creates a JMS client, which sends a test message
@@ -87,8 +83,6 @@ public class ClientExitTest extends ClientTestBase {
       // // assertActiveSession(0);
    }
 
-   // Package protected ----------------------------------------------------------------------------
-
    @Override
    @Before
    public void setUp() throws Exception {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/CrashClient.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/CrashClient.java
index 332208a..dea7460 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/CrashClient.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/CrashClient.java
@@ -61,17 +61,4 @@ public class CrashClient {
          System.exit(NOT_OK);
       }
    }
-
-   // Command implementation -----------------------------------------------------------------------
-
-   // Public ---------------------------------------------------------------------------------------
-
-   // Package protected ----------------------------------------------------------------------------
-
-   // Protected ------------------------------------------------------------------------------------
-
-   // Private --------------------------------------------------------------------------------------
-
-   // Inner classes --------------------------------------------------------------------------------
-
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/CrashClient2.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/CrashClient2.java
index 637c947..838089d 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/CrashClient2.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/CrashClient2.java
@@ -73,17 +73,4 @@ public class CrashClient2 {
       }
    }
 
-
-   // Command implementation -----------------------------------------------------------------------
-
-   // Public ---------------------------------------------------------------------------------------
-
-   // Package protected ----------------------------------------------------------------------------
-
-   // Protected ------------------------------------------------------------------------------------
-
-   // Private --------------------------------------------------------------------------------------
-
-   // Inner classes --------------------------------------------------------------------------------
-
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/GracefulClient.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/GracefulClient.java
index fd4510a..e6c4088 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/GracefulClient.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/GracefulClient.java
@@ -67,17 +67,4 @@ public class GracefulClient {
       }
    }
 
-
-   // Command implementation -----------------------------------------------------------------------
-
-   // Public ---------------------------------------------------------------------------------------
-
-   // Package protected ----------------------------------------------------------------------------
-
-   // Protected ------------------------------------------------------------------------------------
-
-   // Private --------------------------------------------------------------------------------------
-
-   // Inner classes --------------------------------------------------------------------------------
-
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterTestBase.java
index 3c380b9..939d916 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterTestBase.java
@@ -213,8 +213,6 @@ public abstract class ClusterTestBase extends ActiveMQTestBase {
 
    }
 
-   // Private -------------------------------------------------------------------------------------------------------
-
    private static final int MAX_CONSUMERS = 100;
 
    protected static class ConsumerHolder {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SimpleSymmetricClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SimpleSymmetricClusterTest.java
index 245dba2..0fbe1ab 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SimpleSymmetricClusterTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SimpleSymmetricClusterTest.java
@@ -38,7 +38,6 @@ public class SimpleSymmetricClusterTest extends ClusterTestBase {
    private static final Logger log = Logger.getLogger(SimpleSymmetricClusterTest.class);
 
 
-   // Public --------------------------------------------------------
 
    public boolean isNetty() {
       return false;
@@ -476,12 +475,4 @@ public class SimpleSymmetricClusterTest extends ClusterTestBase {
 
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/TwoWayTwoNodeClusterWithDiscoveryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/TwoWayTwoNodeClusterWithDiscoveryTest.java
index 0023c1b..3b77b2f 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/TwoWayTwoNodeClusterWithDiscoveryTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/TwoWayTwoNodeClusterWithDiscoveryTest.java
@@ -26,11 +26,8 @@ public class TwoWayTwoNodeClusterWithDiscoveryTest extends TwoWayTwoNodeClusterT
    protected static final int groupPort = getUDPDiscoveryPort();
 
 
-   // Public --------------------------------------------------------
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
    @Override
    protected void setupClusters() {
@@ -44,8 +41,6 @@ public class TwoWayTwoNodeClusterWithDiscoveryTest extends TwoWayTwoNodeClusterT
       setupLiveServerWithDiscovery(1, groupAddress, groupPort, isFileStorage(), isNetty(), false);
    }
 
-   // Private -------------------------------------------------------
 
-   // Inner classes -------------------------------------------------
 
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTest.java
index 73b7bf6..436f4ac 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTest.java
@@ -2516,9 +2516,7 @@ public class FailoverTest extends FailoverTestBase {
       Assert.assertNotNull(sf.getConnection());
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
    @Override
    protected TransportConfiguration getAcceptorTransportConfiguration(final boolean live) {
@@ -2575,6 +2573,5 @@ public class FailoverTest extends FailoverTestBase {
       return session;
    }
 
-   // Inner classes -------------------------------------------------
 
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTestBase.java
index 9268301..e7335aa 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTestBase.java
@@ -360,9 +360,7 @@ public abstract class FailoverTestBase extends ActiveMQTestBase {
                         final ClientSession... sessions) throws Exception {
       liveServer.crash(failover, waitFailure, sessions);
    }
-   // Private -------------------------------------------------------
 
-   // Inner classes -------------------------------------------------
 
    public static final class LatchClusterTopologyListener implements ClusterTopologyListener {
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/PagingFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/PagingFailoverTest.java
index a10d75c..d145b89 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/PagingFailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/PagingFailoverTest.java
@@ -58,7 +58,6 @@ public class PagingFailoverTest extends FailoverTestBase {
 
    private ClientSessionFactoryInternal sf;
 
-   // Public --------------------------------------------------------
 
    @Override
    @Before
@@ -202,9 +201,7 @@ public class PagingFailoverTest extends FailoverTestBase {
 
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
    @Override
    protected TransportConfiguration getAcceptorTransportConfiguration(final boolean live) {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java
index 955107e..9dfddb2 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java
@@ -59,7 +59,6 @@ public abstract class MultiThreadRandomReattachTestBase extends MultiThreadReatt
    protected ActiveMQServer server;
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testA() throws Exception {
@@ -214,9 +213,7 @@ public abstract class MultiThreadRandomReattachTestBase extends MultiThreadReatt
       }, NUM_THREADS, false);
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
    @Override
    protected abstract void start() throws Exception;
@@ -1104,7 +1101,6 @@ public abstract class MultiThreadRandomReattachTestBase extends MultiThreadReatt
       return 10;
    }
 
-   // Private -------------------------------------------------------
 
    private void runTestMultipleThreads(final RunnableT runnable,
                                        final int numThreads,
@@ -1196,7 +1192,6 @@ public abstract class MultiThreadRandomReattachTestBase extends MultiThreadReatt
       }
    }
 
-   // Inner classes -------------------------------------------------
 
    private class MyHandler implements MessageHandler {
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/MultiThreadReattachSupportTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/MultiThreadReattachSupportTestBase.java
index 2eb12f8..4da1bd9 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/MultiThreadReattachSupportTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/MultiThreadReattachSupportTestBase.java
@@ -159,7 +159,6 @@ public abstract class MultiThreadReattachSupportTestBase extends ActiveMQTestBas
       }
    }
 
-   // Private -------------------------------------------------------
 
    private Failer startFailer(final long time, final ClientSession session, final boolean failOnCreateConnection) {
       Failer failer = new Failer(session, failOnCreateConnection);
@@ -172,7 +171,6 @@ public abstract class MultiThreadReattachSupportTestBase extends ActiveMQTestBas
       return failer;
    }
 
-   // Inner classes -------------------------------------------------
 
    protected abstract class RunnableT extends Thread {
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/OrderReattachTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/OrderReattachTest.java
index 95d69da..2b3af42 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/OrderReattachTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/OrderReattachTest.java
@@ -47,7 +47,6 @@ public class OrderReattachTest extends ActiveMQTestBase {
    private ActiveMQServer server;
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testOrderOnSendInVM() throws Throwable {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/RandomReattachTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/RandomReattachTest.java
index dee1525..66fb660 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/RandomReattachTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/RandomReattachTest.java
@@ -68,7 +68,6 @@ public class RandomReattachTest extends ActiveMQTestBase {
    private Timer timer;
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testA() throws Exception {
@@ -221,9 +220,7 @@ public class RandomReattachTest extends ActiveMQTestBase {
       }
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
    protected void doTestA(final ClientSessionFactory sf) throws Exception {
       long start = System.currentTimeMillis();
@@ -1237,7 +1234,6 @@ public class RandomReattachTest extends ActiveMQTestBase {
       super.tearDown();
    }
 
-   // Private -------------------------------------------------------
 
    private Failer startFailer(final long time, final ClientSession session) {
       Failer failer = new Failer((ClientSessionInternal) session);
@@ -1260,7 +1256,6 @@ public class RandomReattachTest extends ActiveMQTestBase {
       server = null;
    }
 
-   // Inner classes -------------------------------------------------
 
    class Failer extends TimerTask {
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/ReattachTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/ReattachTest.java
index b5a6236..37d4899 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/ReattachTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/ReattachTest.java
@@ -1018,9 +1018,7 @@ public class ReattachTest extends ActiveMQTestBase {
       sf.close();
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
    @Override
    @Before
@@ -1042,7 +1040,5 @@ public class ReattachTest extends ActiveMQTestBase {
       super.tearDown();
    }
 
-   // Private -------------------------------------------------------
 
-   // Inner classes -------------------------------------------------
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/FloodServerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/FloodServerTest.java
index fa1dfc9..0c1069f 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/FloodServerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/FloodServerTest.java
@@ -49,11 +49,8 @@ public class FloodServerTest extends ActiveMQTestBase {
 
    // TestCase overrides -------------------------------------------
 
-   // Public --------------------------------------------------------
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
    @Override
    @Before
@@ -65,9 +62,7 @@ public class FloodServerTest extends ActiveMQTestBase {
       server.start();
    }
 
-   // Private -------------------------------------------------------
 
-   // Inner classes -------------------------------------------------
 
    @Test
    public void testFoo() {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/ManualReconnectionToSingleServerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/ManualReconnectionToSingleServerTest.java
index 5517606..b19d0a6 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/ManualReconnectionToSingleServerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/ManualReconnectionToSingleServerTest.java
@@ -121,9 +121,7 @@ public class ManualReconnectionToSingleServerTest extends ActiveMQTestBase {
 
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
    @Override
    @Before
@@ -147,9 +145,7 @@ public class ManualReconnectionToSingleServerTest extends ActiveMQTestBase {
       allMessagesReceived = new CountDownLatch(1);
    }
 
-   // Private -------------------------------------------------------
 
-   // Inner classes -------------------------------------------------
 
    protected void disconnect() {
       instanceLog.debug("calling disconnect");
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/CreateQueueTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/CreateQueueTest.java
index c1dceb6..4390974 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/CreateQueueTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/CreateQueueTest.java
@@ -28,7 +28,6 @@ import org.junit.Test;
 public class CreateQueueTest extends JMSTestBase {
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testCreateQueueTempQueue() throws Exception {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/ExpiryMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/ExpiryMessageTest.java
index 97f6854..7a89c62 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/ExpiryMessageTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/ExpiryMessageTest.java
@@ -33,7 +33,6 @@ import org.junit.Test;
 public class ExpiryMessageTest extends JMSTestBase {
 
 
-   // Public --------------------------------------------------------
 
    @Override
    protected Configuration createDefaultConfig(boolean netty) throws Exception {
@@ -74,10 +73,6 @@ public class ExpiryMessageTest extends JMSTestBase {
 
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
-   // Private -------------------------------------------------------
-   // Inner classes -------------------------------------------------
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/MessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/MessageTest.java
index 4afeca2..cf24290 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/MessageTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/MessageTest.java
@@ -43,7 +43,6 @@ public class MessageTest extends JMSTestBase {
    private static final String propName3 = "myprop3";
 
 
-   // Public --------------------------------------------------------
 
    /**
     * @see https://jira.jboss.org/jira/browse/HORNETQ-242
@@ -203,11 +202,8 @@ public class MessageTest extends JMSTestBase {
       checkProperties(received);
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
-   // Private -------------------------------------------------------
 
    private void checkProperties(final Message message) throws Exception {
       Assert.assertNull(message.getObjectProperty(MessageTest.propName1));
@@ -305,5 +301,4 @@ public class MessageTest extends JMSTestBase {
       return received;
    }
 
-   // Inner classes -------------------------------------------------
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/NewQueueRequestorTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/NewQueueRequestorTest.java
index d4aa5f6..60b6981 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/NewQueueRequestorTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/NewQueueRequestorTest.java
@@ -66,14 +66,6 @@ public class NewQueueRequestorTest extends JMSTestBase {
       }
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
    class TestMessageListener implements MessageListener {
 
       private final QueueSession sess;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/NoLocalSubscriberTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/NoLocalSubscriberTest.java
index 1ec9b7f..6a01868 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/NoLocalSubscriberTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/NoLocalSubscriberTest.java
@@ -32,7 +32,6 @@ import org.junit.Test;
 
 public class NoLocalSubscriberTest extends JMSTestBase {
 
-   // Public --------------------------------------------------------
 
    /**
     * Test that a message created from the same connection than a nolocal consumer
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/PreACKJMSTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/PreACKJMSTest.java
index 569d1c1..608ac8e 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/PreACKJMSTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/PreACKJMSTest.java
@@ -38,7 +38,6 @@ public class PreACKJMSTest extends JMSTestBase {
    private Queue queue;
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testPreACKAuto() throws Exception {
@@ -131,9 +130,7 @@ public class PreACKJMSTest extends JMSTestBase {
       assertNotNull("ConnectionFactory is on PreACK mode but it is transacted", msg2);
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
    @Override
    @Before
@@ -155,8 +152,6 @@ public class PreACKJMSTest extends JMSTestBase {
       jmsServer.createConnectionFactory("ManualReconnectionToSingleServerTest", false, JMSFactoryType.CF, connectors, null, ActiveMQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, ActiveMQClient.DEFAULT_CONNECTION_TTL, callTimeout, ActiveMQClient.DEFAULT_CALL_FAILOVER_TIMEOUT, ActiveMQClient.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT, ActiveMQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, ActiveMQClient.DEFAULT_COMPRESS_LARGE_MESSAGES, ActiveMQClient.DEFAULT_CONSUMER_WINDOW_SIZE, ActiveMQClient.DEFAULT_CONS [...]
    }
 
-   // Private -------------------------------------------------------
 
-   // Inner classes -------------------------------------------------
 
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/ReSendMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/ReSendMessageTest.java
index e05f850..cbadb6a 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/ReSendMessageTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/ReSendMessageTest.java
@@ -48,7 +48,6 @@ public class ReSendMessageTest extends JMSTestBase {
    private Queue queue;
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testResendWithLargeMessage() throws Exception {
@@ -217,9 +216,7 @@ public class ReSendMessageTest extends JMSTestBase {
       }
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
    @Override
    protected void createCF(final List<TransportConfiguration> connectorConfigs,
                            final String... jndiBindings) throws Exception {
@@ -238,8 +235,6 @@ public class ReSendMessageTest extends JMSTestBase {
       queue = createQueue("queue1");
    }
 
-   // Private -------------------------------------------------------
 
-   // Inner classes -------------------------------------------------
 
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java
index b67ca86..d511f19 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java
@@ -43,7 +43,6 @@ import org.junit.Test;
 public class SessionClosedOnRemotingConnectionFailureTest extends JMSTestBase {
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testSessionClosedOnRemotingConnectionFailure() throws Exception {
@@ -106,11 +105,5 @@ public class SessionClosedOnRemotingConnectionFailureTest extends JMSTestBase {
       }
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/StoreConfigTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/StoreConfigTest.java
index 9641641..f1ad57f 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/StoreConfigTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/StoreConfigTest.java
@@ -316,12 +316,4 @@ public class StoreConfigTest extends JMSTestBase {
       conn.close();
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/TextMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/TextMessageTest.java
index 0ada5fa..eeed30a 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/TextMessageTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/TextMessageTest.java
@@ -38,7 +38,6 @@ public class TextMessageTest extends JMSTestBase {
    private Queue queue;
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testSendReceiveNullBody() throws Exception {
@@ -160,9 +159,7 @@ public class TextMessageTest extends JMSTestBase {
       assertEquals(str, received4.getText());
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
    @Override
    @Before
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSFailoverListenerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSFailoverListenerTest.java
index 0de22f9..0f76c43 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSFailoverListenerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSFailoverListenerTest.java
@@ -84,7 +84,6 @@ public class JMSFailoverListenerTest extends ActiveMQTestBase {
    private TransportConfiguration backupAcceptortc;
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testAutomaticFailover() throws Exception {
@@ -240,9 +239,7 @@ public class JMSFailoverListenerTest extends ActiveMQTestBase {
       connBackup.close();
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
    @Override
    @Before
@@ -286,9 +283,7 @@ public class JMSFailoverListenerTest extends ActiveMQTestBase {
       JMSUtil.waitForServer(backupServer);
    }
 
-   // Private -------------------------------------------------------
 
-   // Inner classes -------------------------------------------------
 
    private static class MyFailoverListener implements FailoverEventListener {
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSFailoverTest.java
index 7653620..472070d 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSFailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSFailoverTest.java
@@ -113,7 +113,6 @@ public class JMSFailoverTest extends ActiveMQTestBase {
 
    private TransportConfiguration backupAcceptortc;
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testCreateQueue() throws Exception {
@@ -506,9 +505,7 @@ public class JMSFailoverTest extends ActiveMQTestBase {
       f.set(locator, value);
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
    @Override
    @Before
@@ -563,9 +560,7 @@ public class JMSFailoverTest extends ActiveMQTestBase {
       JMSUtil.waitForServer(backupServer);
    }
 
-   // Private -------------------------------------------------------
 
-   // Inner classes -------------------------------------------------
 
    private static class MyExceptionListener implements ExceptionListener {
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSReconnectTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSReconnectTest.java
index 2527201..a294f83 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSReconnectTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSReconnectTest.java
@@ -285,9 +285,7 @@ public class JMSReconnectTest extends ActiveMQTestBase {
       conn.close();
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
    @Override
    @Before
@@ -298,9 +296,7 @@ public class JMSReconnectTest extends ActiveMQTestBase {
       server.start();
    }
 
-   // Private -------------------------------------------------------
 
-   // Inner classes -------------------------------------------------
 
    private static class MyExceptionListener implements ExceptionListener {
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/TemporaryQueueClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/TemporaryQueueClusterTest.java
index 9513372..943b103 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/TemporaryQueueClusterTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/TemporaryQueueClusterTest.java
@@ -31,7 +31,6 @@ public class TemporaryQueueClusterTest extends JMSClusteredTestBase {
    public static final String QUEUE_NAME = "target";
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testClusteredQueue() throws Exception {
@@ -140,12 +139,4 @@ public class TemporaryQueueClusterTest extends JMSClusteredTestBase {
 
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/TopicClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/TopicClusterTest.java
index fe2ca8a..61ac240 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/TopicClusterTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/TopicClusterTest.java
@@ -41,7 +41,6 @@ public class TopicClusterTest extends JMSClusteredTestBase {
 
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testDeleteTopicAfterClusteredSend() throws Exception {
@@ -178,12 +177,4 @@ public class TopicClusterTest extends JMSClusteredTestBase {
       assertTrue(checked);
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/ConnectionFactorySerializationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/ConnectionFactorySerializationTest.java
index 54a088a..f677373 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/ConnectionFactorySerializationTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/ConnectionFactorySerializationTest.java
@@ -61,7 +61,6 @@ public class ConnectionFactorySerializationTest extends JMSTestBase {
       super.setUp();
    }
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testConnectionFactoryUDP() throws Exception {
@@ -317,9 +316,7 @@ public class ConnectionFactorySerializationTest extends JMSTestBase {
       return cl.cast(o);
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
    protected static InetAddress getLocalHost() throws UnknownHostException {
       InetAddress addr;
@@ -331,7 +328,5 @@ public class ConnectionFactorySerializationTest extends JMSTestBase {
       return addr;
    }
 
-   // Private -------------------------------------------------------
 
-   // Inner classes -------------------------------------------------
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/ConnectionFactoryWithJGroupsSerializationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/ConnectionFactoryWithJGroupsSerializationTest.java
index dc2828b..d3ff863 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/ConnectionFactoryWithJGroupsSerializationTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/ConnectionFactoryWithJGroupsSerializationTest.java
@@ -83,7 +83,6 @@ public class ConnectionFactoryWithJGroupsSerializationTest extends JMSTestBase {
       }
    }
 
-   // Public --------------------------------------------------------
 
    //HORNETQ-1389
    //Here we deploy two Connection Factories with JGroups discovery groups.
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/largemessage/JMSLargeMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/largemessage/JMSLargeMessageTest.java
index afad205..6e52b90 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/largemessage/JMSLargeMessageTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/largemessage/JMSLargeMessageTest.java
@@ -44,7 +44,6 @@ public class JMSLargeMessageTest extends JMSTestBase {
 
 
 
-   // Public --------------------------------------------------------
 
    @Override
    protected boolean usePersistence() {
@@ -294,14 +293,6 @@ public class JMSLargeMessageTest extends JMSTestBase {
 
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
    class ThreadReader extends Thread {
 
       CountDownLatch latch;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/JMSServerDeployerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/JMSServerDeployerTest.java
index 7be6f14..3c9e658 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/JMSServerDeployerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/JMSServerDeployerTest.java
@@ -48,7 +48,6 @@ public class JMSServerDeployerTest extends ActiveMQTestBase {
 
    private Configuration config;
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testDeployUnusualQueueNames() throws Exception {
@@ -102,9 +101,7 @@ public class JMSServerDeployerTest extends ActiveMQTestBase {
       Assert.assertEquals(jmsTopicName, topic.getTopicName());
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
    @Override
    @Before
@@ -123,8 +120,6 @@ public class JMSServerDeployerTest extends ActiveMQTestBase {
       jmsServer.start();
    }
 
-   // Private -------------------------------------------------------
 
-   // Inner classes -------------------------------------------------
 
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/config/JMSServerConfigParserTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/config/JMSServerConfigParserTest.java
index 5878ec9..7189b5b 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/config/JMSServerConfigParserTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/config/JMSServerConfigParserTest.java
@@ -29,7 +29,6 @@ public class JMSServerConfigParserTest extends ActiveMQTestBase {
 
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testParsing() throws Exception {
@@ -55,12 +54,4 @@ public class JMSServerConfigParserTest extends ActiveMQTestBase {
 
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSUtil.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSUtil.java
index 901c987..e7ef7d2 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSUtil.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSUtil.java
@@ -260,15 +260,6 @@ public class JMSUtil {
    }
 
 
-   // Public --------------------------------------------------------
-
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
 
    public static ActiveMQConnection createConnectionAndWaitForTopology(ActiveMQConnectionFactory factory,
                                                                        int topologyMembers,
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOImportExportTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOImportExportTest.java
index 7dd83f1..669dcb2 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOImportExportTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOImportExportTest.java
@@ -34,7 +34,6 @@ public class NIOImportExportTest extends JournalImplTestBase {
    }
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testExportImport() throws Exception {
@@ -177,12 +176,4 @@ public class NIOImportExportTest extends JournalImplTestBase {
 
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/ValidateTransactionHealthTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/ValidateTransactionHealthTest.java
index 5e691b8..4876ef9 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/ValidateTransactionHealthTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/ValidateTransactionHealthTest.java
@@ -127,8 +127,6 @@ public class ValidateTransactionHealthTest extends SpawnedTestBase {
    }
 
 
-   // Package protected ---------------------------------------------
-
    private void internalTest(final String type,
                              final String journalDir,
                              final long numberOfRecords,
@@ -185,7 +183,6 @@ public class ValidateTransactionHealthTest extends SpawnedTestBase {
 
    }
 
-   // Inner classes -------------------------------------------------
 
    static class Loader implements LoaderCallback {
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/largemessage/LargeMessageTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/largemessage/LargeMessageTestBase.java
index a60c79d..bd32dd4 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/largemessage/LargeMessageTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/largemessage/LargeMessageTestBase.java
@@ -64,11 +64,8 @@ public abstract class LargeMessageTestBase extends ActiveMQTestBase {
 
 
 
-   // Public --------------------------------------------------------
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
    protected StoreConfiguration.StoreType storeType;
 
@@ -696,7 +693,5 @@ public abstract class LargeMessageTestBase extends ActiveMQTestBase {
       }
    }
 
-   // Private -------------------------------------------------------
 
-   // Inner classes -------------------------------------------------
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/largemessage/ServerLargeMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/largemessage/ServerLargeMessageTest.java
index 60b3a74..0c58db7 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/largemessage/ServerLargeMessageTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/largemessage/ServerLargeMessageTest.java
@@ -85,7 +85,6 @@ public class ServerLargeMessageTest extends ActiveMQTestBase {
 
 
 
-   // Public --------------------------------------------------------
 
    // The ClientConsumer should be able to also send ServerLargeMessages as that's done by the CoreBridge
    @Test
@@ -370,13 +369,6 @@ public class ServerLargeMessageTest extends ActiveMQTestBase {
       mockFile.close();
    }
 
-      // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
    private class MockSequentialFile extends AbstractSequentialFile {
 
       private SequentialFile originalFile;
@@ -458,5 +450,4 @@ public class ServerLargeMessageTest extends ActiveMQTestBase {
          return originalFile.cloneFile();
       }
    }
-
-}
+}
\ No newline at end of file
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AcceptorControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AcceptorControlTest.java
index faf08af..95af1df 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AcceptorControlTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AcceptorControlTest.java
@@ -40,7 +40,6 @@ import org.junit.Test;
 public class AcceptorControlTest extends ManagementTestBase {
 
 
-   // Public --------------------------------------------------------
 
    public boolean usingCore() {
       return false;
@@ -160,9 +159,7 @@ public class AcceptorControlTest extends ManagementTestBase {
       return i;
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
    protected AcceptorControl createManagementControl(final String name) throws Exception {
       return ManagementControlHelper.createAcceptorControl(name, mbeanServer);
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AcceptorControlUsingCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AcceptorControlUsingCoreTest.java
index 1751a10..e322839 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AcceptorControlUsingCoreTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AcceptorControlUsingCoreTest.java
@@ -76,7 +76,6 @@ public class AcceptorControlUsingCoreTest extends AcceptorControlTest {
       };
    }
 
-   // Public --------------------------------------------------------
 
    @Override
    public boolean usingCore() {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java
index 95a0967..c4e3c26 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java
@@ -145,7 +145,6 @@ public class ActiveMQServerControlTest extends ManagementTestBase {
    }
 
 
-   // Public --------------------------------------------------------
 
    public boolean usingCore() {
       return false;
@@ -4308,12 +4307,10 @@ public class ActiveMQServerControlTest extends ManagementTestBase {
       }
    }
 
-   // Package protected ---------------------------------------------
    interface ScaleDownHandler {
 
       void scaleDown(ActiveMQServerControl control) throws Exception;
    }
-   // Protected -----------------------------------------------------
 
    @Override
    @Before
@@ -4345,7 +4342,6 @@ public class ActiveMQServerControlTest extends ManagementTestBase {
       return ManagementControlHelper.createActiveMQServerControl(mbeanServer);
    }
 
-   // Private -------------------------------------------------------
 
    private String createJsonFilter(String fieldName, String operationName, String value) {
       HashMap<String, Object> filterMap = new HashMap<>();
@@ -4390,7 +4386,6 @@ public class ActiveMQServerControlTest extends ManagementTestBase {
       }
       session.commit();
    }
-   // Inner classes -------------------------------------------------
 
 }
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlUsingCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlUsingCoreTest.java
index 9f65270..a1bd1fc 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlUsingCoreTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlUsingCoreTest.java
@@ -33,7 +33,6 @@ public class ActiveMQServerControlUsingCoreTest extends ActiveMQServerControlTes
       super(legacyCreateQueue);
    }
 
-   // Public --------------------------------------------------------
 
    // ActiveMQServerControlTest overrides --------------------------
 
@@ -1659,12 +1658,4 @@ public class ActiveMQServerControlUsingCoreTest extends ActiveMQServerControlTes
    public boolean usingCore() {
       return true;
    }
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AddressControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AddressControlTest.java
index 21dbb6a..4ed58be 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AddressControlTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AddressControlTest.java
@@ -693,9 +693,7 @@ public class AddressControlTest extends ManagementTestBase {
       }
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
    @Override
    @Before
@@ -719,9 +717,7 @@ public class AddressControlTest extends ManagementTestBase {
       return ManagementControlHelper.createAddressControl(address, mbeanServer);
    }
 
-   // Private -------------------------------------------------------
 
 
-   // Inner classes -------------------------------------------------
 
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AddressControlUsingCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AddressControlUsingCoreTest.java
index 4fdc526..e160dfe 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AddressControlUsingCoreTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AddressControlUsingCoreTest.java
@@ -204,15 +204,12 @@ public class AddressControlUsingCoreTest extends AddressControlTest {
       };
    }
 
-   // Public --------------------------------------------------------
 
    @Override
    public boolean usingCore() {
       return true;
    }
 
-   // Private -------------------------------------------------------
 
-   // Inner classes -------------------------------------------------
 
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/BridgeControlUsingCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/BridgeControlUsingCoreTest.java
index 7faf982..bacc2f5 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/BridgeControlUsingCoreTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/BridgeControlUsingCoreTest.java
@@ -93,9 +93,7 @@ public class BridgeControlUsingCoreTest extends ManagementTestBase {
       Assert.assertTrue((Boolean) proxy.retrieveAttributeValue("Started"));
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
    @Override
    @Before
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ClusterConnectionControl2Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ClusterConnectionControl2Test.java
index eb4ebba..397da5d 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ClusterConnectionControl2Test.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ClusterConnectionControl2Test.java
@@ -59,7 +59,6 @@ public class ClusterConnectionControl2Test extends ManagementTestBase {
 
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testNodes() throws Exception {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ClusterConnectionControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ClusterConnectionControlTest.java
index 9c57b8e..092bce2 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ClusterConnectionControlTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ClusterConnectionControlTest.java
@@ -63,7 +63,6 @@ public class ClusterConnectionControlTest extends ManagementTestBase {
 
    private MBeanServer mbeanServer_1;
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testAttributes1() throws Exception {
@@ -179,9 +178,7 @@ public class ClusterConnectionControlTest extends ManagementTestBase {
       return result;
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
    @Override
    @Before
@@ -228,8 +225,6 @@ public class ClusterConnectionControlTest extends ManagementTestBase {
       return ManagementControlHelper.createClusterConnectionControl(name, mbeanServer);
    }
 
-   // Private -------------------------------------------------------
 
-   // Inner classes -------------------------------------------------
 
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ClusterConnectionControlUsingCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ClusterConnectionControlUsingCoreTest.java
index 1ff0e0f..44e2d7d 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ClusterConnectionControlUsingCoreTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ClusterConnectionControlUsingCoreTest.java
@@ -130,14 +130,5 @@ public class ClusterConnectionControlUsingCoreTest extends ClusterConnectionCont
       };
    }
 
-   // Public --------------------------------------------------------
-
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
 
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/CoreMessagingProxy.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/CoreMessagingProxy.java
index 15aae49..6f1973c 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/CoreMessagingProxy.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/CoreMessagingProxy.java
@@ -39,11 +39,8 @@ public class CoreMessagingProxy {
       this.resourceName = resourceName;
    }
 
-   // Public --------------------------------------------------------
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
    public Object retrieveAttributeValue(final String attributeName) {
       return retrieveAttributeValue(attributeName, null);
@@ -90,7 +87,6 @@ public class CoreMessagingProxy {
       }
    }
 
-   // Private -------------------------------------------------------
 
    private ClientSession getSession(ClientSessionFactory sessionFactory) throws ActiveMQException {
       ClientSession session = sessionFactory.createSession(false, true, true);
@@ -102,6 +98,5 @@ public class CoreMessagingProxy {
       return new ClientRequestor(session, ActiveMQDefaultConfiguration.getDefaultManagementAddress());
    }
 
-   // Inner classes -------------------------------------------------
 
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/DivertControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/DivertControlTest.java
index eec9695..57496ed 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/DivertControlTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/DivertControlTest.java
@@ -41,7 +41,6 @@ public class DivertControlTest extends ManagementTestBase {
    private DivertConfiguration divertConfig;
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testAttributes() throws Exception {
@@ -88,9 +87,7 @@ public class DivertControlTest extends ManagementTestBase {
       Assert.assertTrue(divertControl.isRetroactiveResource());
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
    @Override
    @Before
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/DivertControlUsingCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/DivertControlUsingCoreTest.java
index 549f324..5a69620 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/DivertControlUsingCoreTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/DivertControlUsingCoreTest.java
@@ -89,14 +89,5 @@ public class DivertControlUsingCoreTest extends DivertControlTest {
       };
    }
 
-   // Public --------------------------------------------------------
-
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
 
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementControlHelper.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementControlHelper.java
index 1b698a9..905d579 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementControlHelper.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementControlHelper.java
@@ -103,20 +103,11 @@ public class ManagementControlHelper {
 
 
 
-   // Public --------------------------------------------------------
-
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
    public static Object createProxy(final ObjectName objectName,
                                      final Class mbeanInterface,
                                      final MBeanServer mbeanServer) {
       return MBeanServerInvocationHandler.newProxyInstance(mbeanServer, objectName, mbeanInterface, false);
    }
 
-   // Inner classes -------------------------------------------------
 
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementHelperTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementHelperTest.java
index beb2daf..1ac3889 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementHelperTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementHelperTest.java
@@ -33,7 +33,6 @@ public class ManagementHelperTest extends Assert {
 
    private static final Logger log = Logger.getLogger(ManagementHelperTest.class);
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testArrayOfStringParameter() throws Exception {
@@ -220,12 +219,4 @@ public class ManagementHelperTest extends Assert {
 
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementServiceImplTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementServiceImplTest.java
index 3647db7..d7640c9 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementServiceImplTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementServiceImplTest.java
@@ -199,11 +199,5 @@ public class ManagementServiceImplTest extends ActiveMQTestBase {
    }
 
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementTestBase.java
index 590f0c1..5c6b0cf 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementTestBase.java
@@ -63,11 +63,8 @@ public abstract class ManagementTestBase extends ActiveMQTestBase {
 
 
 
-   // Public --------------------------------------------------------
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
    @Override
    @Before
@@ -146,8 +143,6 @@ public abstract class ManagementTestBase extends ActiveMQTestBase {
       return control.getMessagesAdded();
    }
 
-   // Private -------------------------------------------------------
 
-   // Inner classes -------------------------------------------------
 
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/NotificationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/NotificationTest.java
index 81fe2fd..e6e66cd 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/NotificationTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/NotificationTest.java
@@ -65,7 +65,6 @@ public class NotificationTest extends ActiveMQTestBase {
 
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testBINDING_ADDED() throws Exception {
@@ -425,9 +424,7 @@ public class NotificationTest extends ActiveMQTestBase {
       Assert.assertEquals(notifications[0].getTimestamp(), (long) notifications[0].getObjectProperty(ManagementHelper.HDR_NOTIFICATION_TIMESTAMP));
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
    @Override
    @Before
@@ -457,7 +454,6 @@ public class NotificationTest extends ActiveMQTestBase {
       notifConsumer = session.createConsumer(notifQueue);
    }
 
-   // Private -------------------------------------------------------
 
    private static void flush(final ClientConsumer notifConsumer) throws ActiveMQException {
       ClientMessage message = null;
@@ -490,6 +486,5 @@ public class NotificationTest extends ActiveMQTestBase {
       return messages;
    }
 
-   // Inner classes -------------------------------------------------
 
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java
index 66dbcff..4b2a58f 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java
@@ -3880,9 +3880,7 @@ public class QueueControlTest extends ManagementTestBase {
       clientConsumer.close();
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
    @Override
    @Before
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SSLSecurityNotificationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SSLSecurityNotificationTest.java
index 71476f5..2a517a8 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SSLSecurityNotificationTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SSLSecurityNotificationTest.java
@@ -191,7 +191,6 @@ public class SSLSecurityNotificationTest extends ActiveMQTestBase {
       notifConsumer = adminSession.createConsumer(notifQueue);
    }
 
-   // Private -------------------------------------------------------
 
    private static void flush(final ClientConsumer notifConsumer) throws ActiveMQException {
       ClientMessage message = null;
@@ -218,6 +217,5 @@ public class SSLSecurityNotificationTest extends ActiveMQTestBase {
       return messages;
    }
 
-   // Inner classes -------------------------------------------------
 
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityManagementTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityManagementTestBase.java
index 3999efe..499aa68 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityManagementTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityManagementTestBase.java
@@ -35,11 +35,8 @@ public abstract class SecurityManagementTestBase extends ActiveMQTestBase {
    private ActiveMQServer server;
 
 
-   // Public --------------------------------------------------------
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
    @Override
    @Before
@@ -89,8 +86,6 @@ public abstract class SecurityManagementTestBase extends ActiveMQTestBase {
       }
    }
 
-   // Private -------------------------------------------------------
 
-   // Inner classes -------------------------------------------------
 
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java
index d61834f..83e748b 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java
@@ -41,7 +41,6 @@ public class SecurityManagementWithConfiguredAdminUserTest extends SecurityManag
 
 
 
-   // Public --------------------------------------------------------
 
    /**
     * default CLUSTER_ADMIN_USER must work even when there are other
@@ -67,9 +66,7 @@ public class SecurityManagementWithConfiguredAdminUserTest extends SecurityManag
       doSendManagementMessage(null, null, false);
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
    @Override
    protected ActiveMQServer setupAndStartActiveMQServer() throws Exception {
@@ -95,8 +92,6 @@ public class SecurityManagementWithConfiguredAdminUserTest extends SecurityManag
       return server;
    }
 
-   // Private -------------------------------------------------------
 
-   // Inner classes -------------------------------------------------
 
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityManagementWithDefaultConfigurationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityManagementWithDefaultConfigurationTest.java
index d4b094d..171072a 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityManagementWithDefaultConfigurationTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityManagementWithDefaultConfigurationTest.java
@@ -39,9 +39,7 @@ public class SecurityManagementWithDefaultConfigurationTest extends SecurityMana
       doSendManagementMessage(null, null, false);
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
    @Override
    protected ActiveMQServer setupAndStartActiveMQServer() throws Exception {
@@ -52,8 +50,6 @@ public class SecurityManagementWithDefaultConfigurationTest extends SecurityMana
       return server;
    }
 
-   // Private -------------------------------------------------------
 
-   // Inner classes -------------------------------------------------
 
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityManagementWithModifiedConfigurationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityManagementWithModifiedConfigurationTest.java
index bc9d424..91c6f5b 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityManagementWithModifiedConfigurationTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityManagementWithModifiedConfigurationTest.java
@@ -28,7 +28,6 @@ public class SecurityManagementWithModifiedConfigurationTest extends SecurityMan
 
    private final String configuredClusterPassword = "this is not the default password";
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testSendManagementMessageWithModifiedClusterAdminUser() throws Exception {
@@ -50,9 +49,7 @@ public class SecurityManagementWithModifiedConfigurationTest extends SecurityMan
       doSendManagementMessage(null, null, false);
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
    @Override
    protected ActiveMQServer setupAndStartActiveMQServer() throws Exception {
@@ -63,8 +60,6 @@ public class SecurityManagementWithModifiedConfigurationTest extends SecurityMan
       return server;
    }
 
-   // Private -------------------------------------------------------
 
-   // Inner classes -------------------------------------------------
 
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityNotificationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityNotificationTest.java
index 2177f51..1e9e55d 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityNotificationTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityNotificationTest.java
@@ -58,7 +58,6 @@ public class SecurityNotificationTest extends ActiveMQTestBase {
    private SimpleString notifQueue;
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testSECURITY_AUTHENTICATION_VIOLATION() throws Exception {
@@ -167,9 +166,7 @@ public class SecurityNotificationTest extends ActiveMQTestBase {
       guestSession.close();
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
    @Override
    @Before
@@ -204,7 +201,6 @@ public class SecurityNotificationTest extends ActiveMQTestBase {
       notifConsumer = adminSession.createConsumer(notifQueue);
    }
 
-   // Private -------------------------------------------------------
 
    private static void flush(final ClientConsumer notifConsumer) throws ActiveMQException {
       ClientMessage message = null;
@@ -231,6 +227,5 @@ public class SecurityNotificationTest extends ActiveMQTestBase {
       return messages;
    }
 
-   // Inner classes -------------------------------------------------
 
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingCounterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingCounterTest.java
index 5eff637..3dc6c10 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingCounterTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingCounterTest.java
@@ -51,7 +51,6 @@ public class PagingCounterTest extends ActiveMQTestBase {
    private ServerLocator sl;
 
 
-   // Public --------------------------------------------------------
 
    @Before
    public void checkLoggerStart() throws Exception {
@@ -352,6 +351,5 @@ public class PagingCounterTest extends ActiveMQTestBase {
       return server;
    }
 
-   // Inner classes -------------------------------------------------
 
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingSyncTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingSyncTest.java
index 286fefd..243c376 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingSyncTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingSyncTest.java
@@ -100,12 +100,4 @@ public class PagingSyncTest extends ActiveMQTestBase {
       session.close();
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/DeleteQueueRestartTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/DeleteQueueRestartTest.java
index 90bd83b..4750915 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/DeleteQueueRestartTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/DeleteQueueRestartTest.java
@@ -39,7 +39,6 @@ public class DeleteQueueRestartTest extends ActiveMQTestBase {
    private static final String ADDRESS = "ADDRESS";
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testDeleteQueueAndRestart() throws Exception {
@@ -96,12 +95,4 @@ public class DeleteQueueRestartTest extends ActiveMQTestBase {
       server.stop();
 
    }
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/ExportFormatTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/ExportFormatTest.java
index ce75534..2229949 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/ExportFormatTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/ExportFormatTest.java
@@ -139,12 +139,4 @@ public class ExportFormatTest extends ActiveMQTestBase {
       session.commit();
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/JMSDynamicConfigTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/JMSDynamicConfigTest.java
index b26bb89..af6742b 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/JMSDynamicConfigTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/JMSDynamicConfigTest.java
@@ -33,7 +33,6 @@ public class JMSDynamicConfigTest extends JMSTestBase {
    }
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testStart() throws Exception {
@@ -65,12 +64,4 @@ public class JMSDynamicConfigTest extends JMSTestBase {
       }
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/QueueConfigRestartTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/QueueConfigRestartTest.java
index 1f1201a..31ca22e 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/QueueConfigRestartTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/QueueConfigRestartTest.java
@@ -30,7 +30,6 @@ public class QueueConfigRestartTest extends ActiveMQTestBase {
    private static final String ADDRESS = "ADDRESS";
 
 
-   // Public --------------------------------------------------------
 
 
    @Test
@@ -211,12 +210,4 @@ public class QueueConfigRestartTest extends ActiveMQTestBase {
       QueueBinding queueBinding2 = (QueueBinding)server.getPostOffice().getBinding(queue);
       Assert.assertFalse(queueBinding2.getQueue().isEnabled());
    }
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/RestartSMTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/RestartSMTest.java
index 5dc3553..5243f84 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/RestartSMTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/RestartSMTest.java
@@ -44,7 +44,6 @@ public class RestartSMTest extends ActiveMQTestBase {
 
 
 
-   // Public --------------------------------------------------------
 
    @Override
    @Before
@@ -96,12 +95,4 @@ public class RestartSMTest extends ActiveMQTestBase {
       }
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/RolesConfigurationStorageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/RolesConfigurationStorageTest.java
index 66263e2..8e4a86a 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/RolesConfigurationStorageTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/RolesConfigurationStorageTest.java
@@ -123,12 +123,4 @@ public class RolesConfigurationStorageTest extends StorageManagerTestBase {
       }
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/TransportConfigurationEncodingSupportTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/TransportConfigurationEncodingSupportTest.java
index 796ce01..4c6b29c 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/TransportConfigurationEncodingSupportTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/TransportConfigurationEncodingSupportTest.java
@@ -34,7 +34,6 @@ import org.junit.Test;
 
 public class TransportConfigurationEncodingSupportTest extends Assert {
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testTransportConfiguration() throws Exception {
@@ -102,12 +101,4 @@ public class TransportConfigurationEncodingSupportTest extends Assert {
          assertEquals(expected.getParams().get(key).toString(), actual.getParams().get(key).toString());
       }
    }
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQActivationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQActivationTest.java
index 5e5bb12..6f7ccec0 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQActivationTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQActivationTest.java
@@ -24,7 +24,6 @@ import org.junit.Test;
 public class ActiveMQActivationTest extends ActiveMQTestBase {
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testValidateJNDIParameters() throws Exception {
@@ -41,12 +40,4 @@ public class ActiveMQActivationTest extends ActiveMQTestBase {
 
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/DestroyConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/DestroyConsumerTest.java
index 437d439..7bc9336 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/DestroyConsumerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/DestroyConsumerTest.java
@@ -22,7 +22,6 @@ import org.junit.Test;
 public class DestroyConsumerTest extends ActiveMQTestBase {
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testFoo() {
@@ -61,12 +60,4 @@ public class DestroyConsumerTest extends ActiveMQTestBase {
    //
    // }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/NettyNetworkAddressTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/NettyNetworkAddressTest.java
index 321c218..c8b2a4c 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/NettyNetworkAddressTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/NettyNetworkAddressTest.java
@@ -42,8 +42,6 @@ public class NettyNetworkAddressTest extends NetworkAddressTestBase {
       return TransportConstants.LOCAL_PORT_PROP_NAME;
    }
 
-   // Private -------------------------------------------------------
 
-   // Inner classes -------------------------------------------------
 
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/NetworkAddressTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/NetworkAddressTestBase.java
index a63c22b..09b0f67 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/NetworkAddressTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/NetworkAddressTestBase.java
@@ -74,7 +74,6 @@ public abstract class NetworkAddressTestBase extends ActiveMQTestBase {
    }
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testConnectToServerWithSameHost() throws Exception {
@@ -215,9 +214,7 @@ public abstract class NetworkAddressTestBase extends ActiveMQTestBase {
       }
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
    protected abstract String getAcceptorFactoryClassName();
 
@@ -227,8 +224,6 @@ public abstract class NetworkAddressTestBase extends ActiveMQTestBase {
 
    protected abstract String getLocalPortProperty();
 
-   // Private -------------------------------------------------------
 
-   // Inner classes -------------------------------------------------
 
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/PingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/PingTest.java
index 5dab716..8de5748 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/PingTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/PingTest.java
@@ -53,7 +53,6 @@ public class PingTest extends ActiveMQTestBase {
    private ActiveMQServer server;
 
 
-   // Public --------------------------------------------------------
 
    @Override
    @Before
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/ReconnectTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/ReconnectTest.java
index 24501be..6dfcafe 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/ReconnectTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/ReconnectTest.java
@@ -445,12 +445,4 @@ public class ReconnectTest extends ActiveMQTestBase {
 
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/SynchronousCloseTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/SynchronousCloseTest.java
index 7507cfb..6b163f2 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/SynchronousCloseTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/SynchronousCloseTest.java
@@ -31,11 +31,8 @@ public class SynchronousCloseTest extends ActiveMQTestBase {
    private ActiveMQServer server;
 
 
-   // Public --------------------------------------------------------
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
    @Override
    @Before
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/ReplicationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/ReplicationTest.java
index ce873c5..2e0aecd 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/ReplicationTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/ReplicationTest.java
@@ -654,9 +654,7 @@ public final class ReplicationTest extends ActiveMQTestBase {
       return paging;
    }
 
-   // Private -------------------------------------------------------
 
-   // Inner classes -------------------------------------------------
    public static final class TestInterceptor implements Interceptor {
 
       static AtomicBoolean value = new AtomicBoolean(true);
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/scheduling/DelayedMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/scheduling/DelayedMessageTest.java
index 51bad7e..fa24ccd 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/scheduling/DelayedMessageTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/scheduling/DelayedMessageTest.java
@@ -255,7 +255,6 @@ public class DelayedMessageTest extends ActiveMQTestBase {
 
    }
 
-   // Private -------------------------------------------------------
 
    private ClientMessage createDurableMessage(final ClientSession session, final String body) {
       ClientMessage message = session.createMessage(ActiveMQTextMessage.TYPE, true, 0, System.currentTimeMillis(), (byte) 1);
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/scheduling/MultipliedDelayedMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/scheduling/MultipliedDelayedMessageTest.java
index 697d2ce..7ddfeab 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/scheduling/MultipliedDelayedMessageTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/scheduling/MultipliedDelayedMessageTest.java
@@ -114,7 +114,6 @@ public class MultipliedDelayedMessageTest extends ActiveMQTestBase {
       session.close();
    }
 
-   // Private -------------------------------------------------------
 
    private ClientMessage createDurableMessage(final ClientSession session, final String body) {
       ClientMessage message = session.createMessage(ActiveMQTextMessage.TYPE, true, 0, System.currentTimeMillis(), (byte) 1);
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/scheduling/ScheduledMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/scheduling/ScheduledMessageTest.java
index 58160a1..19296ec 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/scheduling/ScheduledMessageTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/scheduling/ScheduledMessageTest.java
@@ -795,7 +795,6 @@ public class ScheduledMessageTest extends ActiveMQTestBase {
       assertEquals(100, count.get());
    }
 
-   // Private -------------------------------------------------------
 
    private void scheduledDelivery(final boolean tx) throws Exception {
       ActiveMQTestBase.forceGC();
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverOneWaySSLTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverOneWaySSLTest.java
index 710bb16..65ce155 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverOneWaySSLTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverOneWaySSLTest.java
@@ -941,8 +941,6 @@ public class CoreClientOverOneWaySSLTest extends ActiveMQTestBase {
       }
    }
 
-   // Package protected ---------------------------------------------
-
    @Override
    @Before
    public void setUp() throws Exception {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverTwoWaySSLTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverTwoWaySSLTest.java
index c21dc45..f9c9eb7 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverTwoWaySSLTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverTwoWaySSLTest.java
@@ -360,8 +360,6 @@ public class CoreClientOverTwoWaySSLTest extends ActiveMQTestBase {
       }
    }
 
-   // Package protected ---------------------------------------------
-
    @Override
    @Before
    public void setUp() throws Exception {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/JMSClusteredTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/JMSClusteredTestBase.java
index b8a1686..c6467fc 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/JMSClusteredTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/JMSClusteredTestBase.java
@@ -67,11 +67,8 @@ public class JMSClusteredTestBase extends ActiveMQTestBase {
 
    // TestCase overrides -------------------------------------------
 
-   // Public --------------------------------------------------------
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
    /**
     * @throws Exception
@@ -184,8 +181,6 @@ public class JMSClusteredTestBase extends ActiveMQTestBase {
       return configuration;
    }
 
-   // Private -------------------------------------------------------
 
-   // Inner classes -------------------------------------------------
 
 }
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/AcknowledgementTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/AcknowledgementTest.java
index 972b4bc..b931f6d 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/AcknowledgementTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/AcknowledgementTest.java
@@ -908,14 +908,6 @@ public class AcknowledgementTest extends JMSTestCase {
       ProxyAssertSupport.assertFalse(listener.failed);
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
    private abstract class LatchListener implements MessageListener {
 
       protected CountDownLatch latch = new CountDownLatch(1);
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/AutoAckMessageListenerTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/AutoAckMessageListenerTest.java
index 9eb47af..ec93a6d 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/AutoAckMessageListenerTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/AutoAckMessageListenerTest.java
@@ -34,7 +34,6 @@ public class AutoAckMessageListenerTest extends JMSTestCase {
    private static final JmsTestLogger log = JmsTestLogger.LOGGER;
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testAutoAckMsgListenerQueue() throws Exception {
@@ -75,14 +74,6 @@ public class AutoAckMessageListenerTest extends JMSTestCase {
       }
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
    private static class AutoAckMsgListener implements MessageListener {
 
       private boolean passed;
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/CTSMiscellaneousTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/CTSMiscellaneousTest.java
index f014fa9..a430486 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/CTSMiscellaneousTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/CTSMiscellaneousTest.java
@@ -46,7 +46,6 @@ public class CTSMiscellaneousTest extends JMSTest {
 
    }
 
-   // Public --------------------------------------------------------
 
    /* By default we send non persistent messages asynchronously for performance reasons
     * when running with strictTCK we send them synchronously
@@ -87,11 +86,5 @@ public class CTSMiscellaneousTest extends JMSTest {
       super.tearDown();
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
 }
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionClosedTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionClosedTest.java
index f95abcf..9846da4 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionClosedTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionClosedTest.java
@@ -39,7 +39,6 @@ public class ConnectionClosedTest extends JMSTestCase {
 
    // TestCase overrides -------------------------------------------
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testCloseOnce() throws Exception {
@@ -319,12 +318,4 @@ public class ConnectionClosedTest extends JMSTestCase {
 
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionTest.java
index 99dfbb5..4bc33cb 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionTest.java
@@ -41,7 +41,6 @@ public class ConnectionTest extends JMSTestCase {
 
    // TestCase overrides -------------------------------------------
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testManyConnections() throws Exception {
@@ -287,14 +286,6 @@ public class ConnectionTest extends JMSTestCase {
       }
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
    static class MyExceptionListener implements ExceptionListener {
 
       JMSException exceptionReceived;
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConsumerClosedTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConsumerClosedTest.java
index cd1e5fc..729f58d 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConsumerClosedTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConsumerClosedTest.java
@@ -32,7 +32,6 @@ public class ConsumerClosedTest extends JMSTestCase {
 
    InitialContext ic;
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testMessagesSentDuringClose() throws Exception {
@@ -68,11 +67,5 @@ public class ConsumerClosedTest extends JMSTestCase {
       }
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
 }
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/DurableSubscriptionTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/DurableSubscriptionTest.java
index f48b3dc..125e827 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/DurableSubscriptionTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/DurableSubscriptionTest.java
@@ -41,7 +41,6 @@ import org.junit.Test;
 public class DurableSubscriptionTest extends JMSTestCase {
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testSimplestDurableSubscription() throws Exception {
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageConsumerTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageConsumerTest.java
index 3fa5688..c4dcbf9 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageConsumerTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageConsumerTest.java
@@ -3702,13 +3702,7 @@ public class MessageConsumerTest extends JMSTestCase {
       }
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
    private class ConnectionCloseMessageListener implements MessageListener {
 
       private Connection conn;
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageProducerTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageProducerTest.java
index 0b6209c..3ea0bc4 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageProducerTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageProducerTest.java
@@ -739,13 +739,7 @@ public class MessageProducerTest extends JMSTestCase {
       assertNotNull(topicConsumer.receive(1000));
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
    private static class CloseCompletionListener implements CompletionListener {
 
       private MessageProducer p;
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageWithReadResolveTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageWithReadResolveTest.java
index 830f844..ef50413 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageWithReadResolveTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageWithReadResolveTest.java
@@ -37,7 +37,6 @@ public class MessageWithReadResolveTest extends JMSTestCase {
 
    // TestCase overrides -------------------------------------------
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testSendReceiveMessage() throws Exception {
@@ -73,11 +72,8 @@ public class MessageWithReadResolveTest extends JMSTestCase {
       conn.close();
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
-   // Private -------------------------------------------------------
 
    /* This class would trigger the exception when serialized with jboss serialization */
    public static class TestMessage implements Serializable {
@@ -122,5 +118,4 @@ public class MessageWithReadResolveTest extends JMSTestCase {
       }
    }
 
-   // Inner classes -------------------------------------------------
 }
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MiscellaneousTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MiscellaneousTest.java
index 7c55f1b..ef8949e 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MiscellaneousTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MiscellaneousTest.java
@@ -44,7 +44,6 @@ public class MiscellaneousTest extends JMSTestCase {
       super.tearDown();
    }
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testBrowser() throws Exception {
@@ -212,14 +211,6 @@ public class MiscellaneousTest extends JMSTestCase {
       }
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
    private class Result {
 
       private boolean success;
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/NonDurableSubscriberTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/NonDurableSubscriberTest.java
index daf7fb5..5bb407b 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/NonDurableSubscriberTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/NonDurableSubscriberTest.java
@@ -30,7 +30,6 @@ import org.junit.Test;
 public class NonDurableSubscriberTest extends JMSTestCase {
 
 
-   // Public --------------------------------------------------------
 
    /**
     * Test introduced as a result of a TCK failure.
@@ -82,12 +81,4 @@ public class NonDurableSubscriberTest extends JMSTestCase {
       }
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ReferenceableTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ReferenceableTest.java
index 9a77f86..85ed184 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ReferenceableTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ReferenceableTest.java
@@ -44,7 +44,6 @@ import org.junit.Test;
 public class ReferenceableTest extends JMSTestCase {
 
 
-   // Public --------------------------------------------------------
 
    @SuppressWarnings("cast")
    @Test
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/SessionTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/SessionTest.java
index a1b43b6..4c2e6f6 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/SessionTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/SessionTest.java
@@ -41,7 +41,6 @@ import org.junit.Test;
 public class SessionTest extends ActiveMQServerTestCase {
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testCreateProducer() throws Exception {
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/TemporaryDestinationTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/TemporaryDestinationTest.java
index 2566601..5afe212 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/TemporaryDestinationTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/TemporaryDestinationTest.java
@@ -33,7 +33,6 @@ import org.junit.Test;
 public class TemporaryDestinationTest extends JMSTestCase {
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testTemp() throws Exception {
@@ -417,11 +416,5 @@ public class TemporaryDestinationTest extends JMSTestCase {
       }
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
 }
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/TopicTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/TopicTest.java
index 4e7cb67..7d16e63 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/TopicTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/TopicTest.java
@@ -34,7 +34,6 @@ import org.junit.Test;
 public class TopicTest extends JMSTestCase {
 
 
-   // Public --------------------------------------------------------
 
    /**
     * The simplest possible topic test.
@@ -127,14 +126,6 @@ public class TopicTest extends JMSTestCase {
       ProxyAssertSupport.assertFalse(l3.failed);
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
    static class Wibble2 implements Serializable {
 
       private static final long serialVersionUID = -5146179676719808756L;
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/TransactedSessionTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/TransactedSessionTest.java
index c3f2945..c63c939 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/TransactedSessionTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/TransactedSessionTest.java
@@ -1055,11 +1055,5 @@ public class TransactedSessionTest extends JMSTestCase {
       ProxyAssertSupport.assertEquals(NUM_MESSAGES * NUM_TX, count);
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
 }
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/BytesMessageTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/BytesMessageTest.java
index fe72db2..2452b26 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/BytesMessageTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/BytesMessageTest.java
@@ -30,7 +30,6 @@ import org.junit.Before;
 public class BytesMessageTest extends MessageTestBase {
 
 
-   // Public --------------------------------------------------------
 
    @Override
    @Before
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSCorrelationIDHeaderTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSCorrelationIDHeaderTest.java
index 8933fe9..9b86d56 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSCorrelationIDHeaderTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSCorrelationIDHeaderTest.java
@@ -24,7 +24,6 @@ import org.junit.Test;
 public class JMSCorrelationIDHeaderTest extends MessageHeaderTestBase {
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testJMSDestination() throws Exception {
@@ -58,11 +57,8 @@ public class JMSCorrelationIDHeaderTest extends MessageHeaderTestBase {
 
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
-   // Private -------------------------------------------------------
 
    private void assertByteArraysEqual(final byte[] bytes1, final byte[] bytes2) {
       if (bytes1 == null || bytes2 == null) {
@@ -79,6 +75,5 @@ public class JMSCorrelationIDHeaderTest extends MessageHeaderTestBase {
 
    }
 
-   // Inner classes -------------------------------------------------
 
 }
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSDeliveryModeHeaderTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSDeliveryModeHeaderTest.java
index eac8f79..c4ef5a0 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSDeliveryModeHeaderTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSDeliveryModeHeaderTest.java
@@ -24,7 +24,6 @@ import org.junit.Test;
 
 public class JMSDeliveryModeHeaderTest extends MessageHeaderTestBase {
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testDefaultDeliveryMode() throws Exception {
@@ -53,12 +52,4 @@ public class JMSDeliveryModeHeaderTest extends MessageHeaderTestBase {
       ProxyAssertSupport.assertEquals(DeliveryMode.PERSISTENT, queueConsumer.receive().getJMSDeliveryMode());
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSDestinationHeaderTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSDestinationHeaderTest.java
index 5962b8c..3ae2a41 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSDestinationHeaderTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSDestinationHeaderTest.java
@@ -24,7 +24,6 @@ import org.junit.Test;
 public class JMSDestinationHeaderTest extends MessageHeaderTestBase {
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testJMSDestination() throws Exception {
@@ -33,11 +32,5 @@ public class JMSDestinationHeaderTest extends MessageHeaderTestBase {
       ProxyAssertSupport.assertEquals(queue1, m.getJMSDestination());
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
 }
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSExpirationHeaderTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSExpirationHeaderTest.java
index 1147a43..3ee903f 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSExpirationHeaderTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSExpirationHeaderTest.java
@@ -38,7 +38,6 @@ public class JMSExpirationHeaderTest extends MessageHeaderTestBase {
    private volatile Message expectedMessage;
 
 
-   // Public --------------------------------------------------------
 
    @Override
    @Before
@@ -282,12 +281,4 @@ public class JMSExpirationHeaderTest extends MessageHeaderTestBase {
       checkEmpty(queue1);
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSMessageIDHeaderTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSMessageIDHeaderTest.java
index d81158d..6f796b3 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSMessageIDHeaderTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSMessageIDHeaderTest.java
@@ -24,7 +24,6 @@ import org.junit.Test;
 public class JMSMessageIDHeaderTest extends MessageHeaderTestBase {
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testJMSMessageIDPrefix() throws Exception {
@@ -65,11 +64,5 @@ public class JMSMessageIDHeaderTest extends MessageHeaderTestBase {
       }
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
 }
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSReplyToHeaderTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSReplyToHeaderTest.java
index cc7917d..ab5bab2 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSReplyToHeaderTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSReplyToHeaderTest.java
@@ -28,7 +28,6 @@ import org.junit.Test;
 public class JMSReplyToHeaderTest extends MessageHeaderTestBase {
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testJMSDestinationSimple() throws Exception {
@@ -51,12 +50,4 @@ public class JMSReplyToHeaderTest extends MessageHeaderTestBase {
       ProxyAssertSupport.assertNull(m.getJMSReplyTo());
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSTimestampHeaderTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSTimestampHeaderTest.java
index c856adb..e38ff7a 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSTimestampHeaderTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSTimestampHeaderTest.java
@@ -24,7 +24,6 @@ import org.junit.Test;
 public class JMSTimestampHeaderTest extends MessageHeaderTestBase {
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testJMSTimestamp() throws Exception {
@@ -48,12 +47,4 @@ public class JMSTimestampHeaderTest extends MessageHeaderTestBase {
       ProxyAssertSupport.assertEquals(0L, queueConsumer.receive().getJMSTimestamp());
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSTypeHeaderTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSTypeHeaderTest.java
index 4bec001..c3a29be 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSTypeHeaderTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSTypeHeaderTest.java
@@ -24,7 +24,6 @@ import org.junit.Test;
 public class JMSTypeHeaderTest extends MessageHeaderTestBase {
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testJMSType() throws Exception {
@@ -43,12 +42,4 @@ public class JMSTypeHeaderTest extends MessageHeaderTestBase {
       ProxyAssertSupport.assertEquals(null, queueConsumer.receive(1000).getJMSType());
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MapMessageTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MapMessageTest.java
index 9a95513..346b373 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MapMessageTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MapMessageTest.java
@@ -30,7 +30,6 @@ import org.junit.Test;
  */
 public class MapMessageTest extends MessageTestBase {
 
-   // Public --------------------------------------------------------
 
    @Override
    @Before
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageHeaderTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageHeaderTest.java
index a38ce30..46ecf49 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageHeaderTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageHeaderTest.java
@@ -65,7 +65,6 @@ import org.junit.Test;
 public class MessageHeaderTest extends MessageHeaderTestBase {
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testClearMessage() throws Exception {
@@ -736,14 +735,6 @@ public class MessageHeaderTest extends MessageHeaderTestBase {
       MessageHeaderTestBase.ensureEquivalent(receivedMessage, (ActiveMQMessage) message);
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
    private static class ForeignDestination implements Destination, Serializable {
 
       private static final long serialVersionUID = 5545509674580823610L;
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessagePropertyConversionTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessagePropertyConversionTest.java
index 03ed0d4..41c0e87 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessagePropertyConversionTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessagePropertyConversionTest.java
@@ -51,7 +51,6 @@ public class MessagePropertyConversionTest extends ActiveMQServerTestCase {
 
 
 
-   // Public --------------------------------------------------------
 
    @Override
    @Before
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageTestBase.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageTestBase.java
index c4aace7..0e17706 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageTestBase.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageTestBase.java
@@ -43,7 +43,6 @@ public abstract class MessageTestBase extends ActiveMQServerTestCase {
 
    protected MessageConsumer queueCons;
 
-   // Public --------------------------------------------------------
 
    @Override
    @Before
@@ -165,9 +164,7 @@ public abstract class MessageTestBase extends ActiveMQServerTestCase {
 
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
    protected void prepareMessage(final Message m) throws JMSException {
       m.setBooleanProperty("booleanProperty", true);
@@ -207,7 +204,5 @@ public abstract class MessageTestBase extends ActiveMQServerTestCase {
       ProxyAssertSupport.assertEquals(mode, m.getJMSDeliveryMode());
    }
 
-   // Private -------------------------------------------------------
 
-   // Inner classes -------------------------------------------------
 }
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/ObjectMessageDeliveryTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/ObjectMessageDeliveryTest.java
index 9ef2cba..f6dbc0d 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/ObjectMessageDeliveryTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/ObjectMessageDeliveryTest.java
@@ -34,7 +34,6 @@ import org.junit.Test;
 public class ObjectMessageDeliveryTest extends ActiveMQServerTestCase {
 
 
-   // Public --------------------------------------------------------
 
    static class TestObject implements Serializable {
 
@@ -112,12 +111,4 @@ public class ObjectMessageDeliveryTest extends ActiveMQServerTestCase {
       }
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSBytesMessage.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSBytesMessage.java
index 8b80bd7..0787403 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSBytesMessage.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSBytesMessage.java
@@ -396,13 +396,9 @@ public class SimpleJMSBytesMessage extends SimpleJMSMessage implements BytesMess
       return internalArray.length;
    }
 
-   // Public --------------------------------------------------------
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
-   // Private -------------------------------------------------------
 
    /**
     * Check the message is readable
@@ -422,5 +418,4 @@ public class SimpleJMSBytesMessage extends SimpleJMSMessage implements BytesMess
       }
    }
 
-   // Inner classes -------------------------------------------------
 }
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSMapMessage.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSMapMessage.java
index 4383c78..225e626 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSMapMessage.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSMapMessage.java
@@ -433,11 +433,8 @@ public class SimpleJMSMapMessage extends SimpleJMSMessage implements MapMessage
 
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
-   // Private -------------------------------------------------------
 
    /**
     * Check the name
@@ -454,6 +451,5 @@ public class SimpleJMSMapMessage extends SimpleJMSMessage implements MapMessage
       }
    }
 
-   // Inner classes -------------------------------------------------
 
 }
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSMessage.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSMessage.java
index d1eac33..03f0ac2 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSMessage.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSMessage.java
@@ -365,13 +365,6 @@ public class SimpleJMSMessage implements Message {
       throw new UnsupportedOperationException("JMS 2.0 / not implemented");
    }
 
-   // Public --------------------------------------------------------
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
 }
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSObjectMessage.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSObjectMessage.java
index 0682ade..d3ade30 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSObjectMessage.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSObjectMessage.java
@@ -38,13 +38,6 @@ public class SimpleJMSObjectMessage extends SimpleJMSMessage implements ObjectMe
       return object;
    }
 
-   // Public --------------------------------------------------------
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
 }
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSStreamMessage.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSStreamMessage.java
index 67eaa82..4d18a22 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSStreamMessage.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSStreamMessage.java
@@ -48,7 +48,6 @@ public class SimpleJMSStreamMessage extends SimpleJMSMessage implements StreamMe
       offset = 0;
    }
 
-   // Public --------------------------------------------------------
 
    // StreamMessage implementation ----------------------------------
 
@@ -526,11 +525,5 @@ public class SimpleJMSStreamMessage extends SimpleJMSMessage implements StreamMe
       offset = 0;
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
 }
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSTextMessage.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSTextMessage.java
index d828dec..1831de6 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSTextMessage.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSTextMessage.java
@@ -45,13 +45,6 @@ public class SimpleJMSTextMessage extends SimpleJMSMessage implements TextMessag
       return text;
    }
 
-   // Public --------------------------------------------------------
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
 }
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/StreamMessageTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/StreamMessageTest.java
index ed10066..9d136ca 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/StreamMessageTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/StreamMessageTest.java
@@ -30,7 +30,6 @@ import org.junit.Test;
  */
 public class StreamMessageTest extends MessageTestBase {
 
-   // Public --------------------------------------------------------
 
    @Override
    @Before
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/TextMessageTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/TextMessageTest.java
index c372881..f3d4c4c 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/TextMessageTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/TextMessageTest.java
@@ -30,7 +30,6 @@ import org.junit.Test;
  */
 public class TextMessageTest extends MessageTestBase {
 
-   // Public --------------------------------------------------------
 
    @Override
    @Before
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/selector/SelectorTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/selector/SelectorTest.java
index 1b2a60f..a5625df 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/selector/SelectorTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/selector/SelectorTest.java
@@ -990,11 +990,5 @@ public class SelectorTest extends ActiveMQServerTestCase {
 
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
 }
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/Constants.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/Constants.java
index a29197a..9358e17 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/Constants.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/Constants.java
@@ -23,13 +23,6 @@ public class Constants {
 
 
 
-   // Public --------------------------------------------------------
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
 }
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/InVMContext.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/InVMContext.java
index 1d6fed6..9555be8 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/InVMContext.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/InVMContext.java
@@ -261,13 +261,9 @@ public class InVMContext implements Context, Serializable {
       return nameInNamespace;
    }
 
-   // Public --------------------------------------------------------
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
-   // Private -------------------------------------------------------
 
    private String trimSlashes(String s) {
       int i = 0;
@@ -304,7 +300,6 @@ public class InVMContext implements Context, Serializable {
       c.map.put(name, obj);
    }
 
-   // Inner classes -------------------------------------------------
 
    private static final class NamingEnumerationImpl implements NamingEnumeration<Binding> {
 
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/InVMInitialContextFactory.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/InVMInitialContextFactory.java
index 5966c96..1fa490f 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/InVMInitialContextFactory.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/InVMInitialContextFactory.java
@@ -45,7 +45,6 @@ public class InVMInitialContextFactory implements InitialContextFactory {
       return env;
    }
 
-   // Public --------------------------------------------------------
 
    @Override
    public Context getInitialContext(final Hashtable<?, ?> environment) throws NamingException {
@@ -94,11 +93,5 @@ public class InVMInitialContextFactory implements InitialContextFactory {
       }
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
 }
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/InVMInitialContextFactoryBuilder.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/InVMInitialContextFactoryBuilder.java
index 2dbe3aa..fe49674 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/InVMInitialContextFactoryBuilder.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/InVMInitialContextFactoryBuilder.java
@@ -33,8 +33,6 @@ public class InVMInitialContextFactoryBuilder implements InitialContextFactoryBu
    public InVMInitialContextFactoryBuilder() {
    }
 
-   // InitialContextFactoryBuilder implementation --------------------------------------------------
-
    @Override
    public InitialContextFactory createInitialContextFactory(final Hashtable<?, ?> environment) throws NamingException {
 
@@ -71,15 +69,4 @@ public class InVMInitialContextFactoryBuilder implements InitialContextFactoryBu
 
       return icf;
    }
-
-   // Public ---------------------------------------------------------------------------------------
-
-   // Package protected ----------------------------------------------------------------------------
-
-   // Protected ------------------------------------------------------------------------------------
-
-   // Private --------------------------------------------------------------------------------------
-
-   // Inner classes --------------------------------------------------------------------------------
-
-}
+}
\ No newline at end of file
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/InVMNameParser.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/InVMNameParser.java
index 3a25e26..263589d 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/InVMNameParser.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/InVMNameParser.java
@@ -40,7 +40,6 @@ public class InVMNameParser implements NameParser, Serializable {
    }
 
 
-   // Public --------------------------------------------------------
 
    public static Properties getSyntax() {
       return InVMNameParser.syntax;
@@ -51,12 +50,4 @@ public class InVMNameParser implements NameParser, Serializable {
       return new CompoundName(name, InVMNameParser.syntax);
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/LocalTestServer.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/LocalTestServer.java
index 5acbaa4..8b54d5c 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/LocalTestServer.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/LocalTestServer.java
@@ -292,14 +292,6 @@ public class LocalTestServer implements Server, Runnable {
       }
    }
 
-   // Public ---------------------------------------------------------------------------------------
-
-   // Package protected ----------------------------------------------------------------------------
-
-   // Protected ------------------------------------------------------------------------------------
-
-   // Private --------------------------------------------------------------------------------------
-
    @Override
    public ActiveMQServer getActiveMQServer() {
       return jmsServerManager.getActiveMQServer();
@@ -365,6 +357,4 @@ public class LocalTestServer implements Server, Runnable {
       getActiveMQServer().getSecurityRepository().addMatch("#", defConfig);
    }
 
-   // Inner classes --------------------------------------------------------------------------------
-
 }
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/util/JNDIUtilTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/util/JNDIUtilTest.java
index 56873ee..bc8fa0c 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/util/JNDIUtilTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/util/JNDIUtilTest.java
@@ -30,7 +30,6 @@ public class JNDIUtilTest extends ActiveMQServerTestCase {
    private InitialContext ic;
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testRebind_1() throws Exception {
@@ -78,9 +77,7 @@ public class JNDIUtilTest extends ActiveMQServerTestCase {
       ic.unbind("doesnotexistyet");
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
    @Override
    @Before
@@ -94,8 +91,6 @@ public class JNDIUtilTest extends ActiveMQServerTestCase {
       log.debug("setup done");
    }
 
-   // Private -------------------------------------------------------
 
-   // Inner classes -------------------------------------------------
 
 }
diff --git a/tests/joram-tests/src/test/java/org/apache/activemq/artemis/common/SpawnedJMSServer.java b/tests/joram-tests/src/test/java/org/apache/activemq/artemis/common/SpawnedJMSServer.java
index 11f16b6..78ba059 100644
--- a/tests/joram-tests/src/test/java/org/apache/activemq/artemis/common/SpawnedJMSServer.java
+++ b/tests/joram-tests/src/test/java/org/apache/activemq/artemis/common/SpawnedJMSServer.java
@@ -101,14 +101,5 @@ public class SpawnedJMSServer {
 
 
 
-   // Public --------------------------------------------------------
-
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
 
 }
diff --git a/tests/joram-tests/src/test/java/org/apache/activemq/artemis/jms/ActiveMQCoreAdmin.java b/tests/joram-tests/src/test/java/org/apache/activemq/artemis/jms/ActiveMQCoreAdmin.java
index df0c4a2..334f694 100644
--- a/tests/joram-tests/src/test/java/org/apache/activemq/artemis/jms/ActiveMQCoreAdmin.java
+++ b/tests/joram-tests/src/test/java/org/apache/activemq/artemis/jms/ActiveMQCoreAdmin.java
@@ -122,6 +122,5 @@ public class ActiveMQCoreAdmin extends AbstractAdmin {
       return this.getClass().getName();
    }
 
-   // Inner classes -------------------------------------------------
 
 }
diff --git a/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/paging/MeasurePagingMultiThreadTest.java b/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/paging/MeasurePagingMultiThreadTest.java
index b7bdb16..b0b52a5 100644
--- a/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/paging/MeasurePagingMultiThreadTest.java
+++ b/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/paging/MeasurePagingMultiThreadTest.java
@@ -145,11 +145,8 @@ public class MeasurePagingMultiThreadTest extends ActiveMQTestBase {
 
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
-   // Private -------------------------------------------------------
 
    /**
     * @param adr
@@ -198,6 +195,5 @@ public class MeasurePagingMultiThreadTest extends ActiveMQTestBase {
       }
    }
 
-   // Inner classes -------------------------------------------------
 
 }
diff --git a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/client/ClientAbstract.java b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/client/ClientAbstract.java
index 8cca6b6..97849f3 100644
--- a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/client/ClientAbstract.java
+++ b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/client/ClientAbstract.java
@@ -61,7 +61,6 @@ public abstract class ClientAbstract extends Thread {
       this.sf = sf;
    }
 
-   // Public --------------------------------------------------------
 
    public ClientSession getConnection() {
       return session;
@@ -177,12 +176,4 @@ public abstract class ClientAbstract extends Thread {
       session = null;
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/client/ClientNonDivertedSoakTest.java b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/client/ClientNonDivertedSoakTest.java
index 728b989..2e4f588 100644
--- a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/client/ClientNonDivertedSoakTest.java
+++ b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/client/ClientNonDivertedSoakTest.java
@@ -47,7 +47,6 @@ public class ClientNonDivertedSoakTest extends ActiveMQTestBase {
    }
 
 
-   // Public --------------------------------------------------------
 
    private ActiveMQServer server;
 
@@ -136,12 +135,4 @@ public class ClientNonDivertedSoakTest extends ActiveMQTestBase {
 
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/client/ClientSoakTest.java b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/client/ClientSoakTest.java
index b1451c6..29164c0 100644
--- a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/client/ClientSoakTest.java
+++ b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/client/ClientSoakTest.java
@@ -54,7 +54,6 @@ public class ClientSoakTest extends ActiveMQTestBase {
    }
 
 
-   // Public --------------------------------------------------------
 
    private ActiveMQServer server;
 
@@ -160,12 +159,4 @@ public class ClientSoakTest extends ActiveMQTestBase {
 
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/client/Receiver.java b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/client/Receiver.java
index bd0d084..d4dbcae 100644
--- a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/client/Receiver.java
+++ b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/client/Receiver.java
@@ -53,7 +53,6 @@ public class Receiver extends ClientAbstract {
       this.queue = queue;
    }
 
-   // Public --------------------------------------------------------
 
    @Override
    public void run() {
@@ -143,12 +142,4 @@ public class Receiver extends ClientAbstract {
       }
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/client/Sender.java b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/client/Sender.java
index d8217b8..394565b 100644
--- a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/client/Sender.java
+++ b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/client/Sender.java
@@ -33,7 +33,6 @@ public class Sender extends ClientAbstract {
 
    protected final Receiver[] receivers;
 
-   // Public --------------------------------------------------------
 
    public Sender(final ClientSessionFactory sf, String queue, final Receiver[] receivers) {
       super(sf);
@@ -93,12 +92,4 @@ public class Sender extends ClientAbstract {
 
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/client/SimpleSendReceiveSoakTest.java b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/client/SimpleSendReceiveSoakTest.java
index a4e2faf..55b402b 100644
--- a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/client/SimpleSendReceiveSoakTest.java
+++ b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/client/SimpleSendReceiveSoakTest.java
@@ -47,7 +47,6 @@ public class SimpleSendReceiveSoakTest extends ActiveMQTestBase {
    }
 
 
-   // Public --------------------------------------------------------
 
    private ActiveMQServer server;
 
diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/chunk/LargeMessageStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/chunk/LargeMessageStressTest.java
index 73afcb9..2ded6fc 100644
--- a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/chunk/LargeMessageStressTest.java
+++ b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/chunk/LargeMessageStressTest.java
@@ -27,19 +27,10 @@ public class LargeMessageStressTest extends LargeMessageTestBase {
    }
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testMessageChunkFilePersistenceOneHugeMessage() throws Exception {
       testChunks(false, false, false, true, true, false, false, false, true, 1, 200 * 1024L * 1024L + 1024L, 120000, 0, 10 * 1024 * 1024, 1024 * 1024);
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/client/SendStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/client/SendStressTest.java
index 57f848d..c3539a3 100644
--- a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/client/SendStressTest.java
+++ b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/client/SendStressTest.java
@@ -31,7 +31,6 @@ import org.junit.Test;
 public class SendStressTest extends ActiveMQTestBase {
 
 
-   // Public --------------------------------------------------------
 
    // Remove this method to re-enable those tests
    @Test
@@ -114,12 +113,4 @@ public class SendStressTest extends ActiveMQTestBase {
 
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/failover/RandomReattachStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/failover/RandomReattachStressTest.java
index 18aaf62..4ab3803 100644
--- a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/failover/RandomReattachStressTest.java
+++ b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/failover/RandomReattachStressTest.java
@@ -21,19 +21,14 @@ import org.apache.activemq.artemis.tests.integration.cluster.reattach.RandomReat
 public class RandomReattachStressTest extends RandomReattachTest {
 
 
-   // Public --------------------------------------------------------
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
    @Override
    protected int getNumIterations() {
       return 100;
    }
 
-   // Private -------------------------------------------------------
 
-   // Inner classes -------------------------------------------------
 
 }
diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/AIOAllPossibilitiesCompactStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/AIOAllPossibilitiesCompactStressTest.java
index ae1ba06..9ea4395 100644
--- a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/AIOAllPossibilitiesCompactStressTest.java
+++ b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/AIOAllPossibilitiesCompactStressTest.java
@@ -25,15 +25,8 @@ import org.apache.activemq.artemis.core.io.aio.AIOSequentialFileFactory;
 public class AIOAllPossibilitiesCompactStressTest extends AllPossibilitiesCompactStressTest {
 
 
-   // Public --------------------------------------------------------
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
    @Override
    protected SequentialFileFactory getFileFactory() throws Exception {
       File file = new File(getTestDir());
diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/AddAndRemoveStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/AddAndRemoveStressTest.java
index 608c354..531e021 100644
--- a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/AddAndRemoveStressTest.java
+++ b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/AddAndRemoveStressTest.java
@@ -65,7 +65,6 @@ public class AddAndRemoveStressTest extends ActiveMQTestBase {
 
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testInsertAndLoad() throws Exception {
diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/CompactingStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/CompactingStressTest.java
index b874fb7..664a51c 100644
--- a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/CompactingStressTest.java
+++ b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/CompactingStressTest.java
@@ -60,7 +60,6 @@ public class CompactingStressTest extends ActiveMQTestBase {
 
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testCleanupAIO() throws Throwable {
diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/JournalCleanupCompactStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/JournalCleanupCompactStressTest.java
index 28b68af..2cd54cf 100644
--- a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/JournalCleanupCompactStressTest.java
+++ b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/JournalCleanupCompactStressTest.java
@@ -509,14 +509,5 @@ public class JournalCleanupCompactStressTest extends ActiveMQTestBase {
    }
 
 
-   // Public --------------------------------------------------------
-
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
 
 }
diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/JournalRestartStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/JournalRestartStressTest.java
index 1508ed4..b7c3eef 100644
--- a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/JournalRestartStressTest.java
+++ b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/JournalRestartStressTest.java
@@ -40,7 +40,6 @@ public class JournalRestartStressTest extends ActiveMQTestBase {
 
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testLoad() throws Throwable {
@@ -86,8 +85,6 @@ public class JournalRestartStressTest extends ActiveMQTestBase {
 
    }
 
-   // Package protected ---------------------------------------------
-
    /**
     * @param sf
     * @param NMSGS
@@ -181,10 +178,4 @@ public class JournalRestartStressTest extends ActiveMQTestBase {
       }
    }
 
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/LargeJournalStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/LargeJournalStressTest.java
index 6d5ab32..edfb18e 100644
--- a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/LargeJournalStressTest.java
+++ b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/LargeJournalStressTest.java
@@ -55,7 +55,6 @@ public class LargeJournalStressTest extends ActiveMQTestBase {
    private ServerLocator locator;
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testMultiProducerAndCompactAIO() throws Throwable {
@@ -272,12 +271,4 @@ public class LargeJournalStressTest extends ActiveMQTestBase {
       // super.tearDown();
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/MixupCompactorTestBase.java b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/MixupCompactorTestBase.java
index 3559b5f..2375095 100644
--- a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/MixupCompactorTestBase.java
+++ b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/MixupCompactorTestBase.java
@@ -53,7 +53,6 @@ public abstract class MixupCompactorTestBase extends JournalImplTestBase {
    SimpleIDGenerator idGen = new SimpleIDGenerator(1000);
 
 
-   // Public --------------------------------------------------------
    @Override
    @Before
    public void setUp() throws Exception {
diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/MultiThreadConsumerStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/MultiThreadConsumerStressTest.java
index 04d90e6..fe12ca3 100644
--- a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/MultiThreadConsumerStressTest.java
+++ b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/MultiThreadConsumerStressTest.java
@@ -165,7 +165,6 @@ public class MultiThreadConsumerStressTest extends ActiveMQTestBase {
    }
 
 
-   // Public --------------------------------------------------------
 
    class BaseThread extends Thread {
 
@@ -289,12 +288,4 @@ public class MultiThreadConsumerStressTest extends ActiveMQTestBase {
       }
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/NIOMultiThreadCompactorStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/NIOMultiThreadCompactorStressTest.java
index 08af0fd..796cd15 100644
--- a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/NIOMultiThreadCompactorStressTest.java
+++ b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/NIOMultiThreadCompactorStressTest.java
@@ -321,7 +321,6 @@ public class NIOMultiThreadCompactorStressTest extends ActiveMQTestBase {
 
 
 
-   // Public --------------------------------------------------------
 
    class BaseThread extends Thread {
 
@@ -456,12 +455,4 @@ public class NIOMultiThreadCompactorStressTest extends ActiveMQTestBase {
       }
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/paging/MultipleConsumersPageStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/paging/MultipleConsumersPageStressTest.java
index 30c9604..bc07146 100644
--- a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/paging/MultipleConsumersPageStressTest.java
+++ b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/paging/MultipleConsumersPageStressTest.java
@@ -201,15 +201,6 @@ public class MultipleConsumersPageStressTest extends ActiveMQTestBase {
    }
 
 
-   // Public --------------------------------------------------------
-
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
 
    abstract class Tester extends Thread {
 
diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/paging/PageCursorStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/paging/PageCursorStressTest.java
index f811dc8..2f39338 100644
--- a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/paging/PageCursorStressTest.java
+++ b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/paging/PageCursorStressTest.java
@@ -789,9 +789,7 @@ public class PageCursorStressTest extends ActiveMQTestBase {
       return (PagingStoreImpl) server.getPagingManager().getPageStore(address);
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
    @Override
    @Before
diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/paging/PageStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/paging/PageStressTest.java
index e9d56e9..28f481a 100644
--- a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/paging/PageStressTest.java
+++ b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/paging/PageStressTest.java
@@ -219,9 +219,7 @@ public class PageStressTest extends ActiveMQTestBase {
       return msgs;
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
    @Override
    protected Configuration createDefaultInVMConfig() throws Exception {
       Configuration config = super.createDefaultInVMConfig().setJournalFileSize(10 * 1024 * 1024).setJournalMinFiles(5);
diff --git a/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/core/server/impl/QueueConcurrentTest.java b/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/core/server/impl/QueueConcurrentTest.java
index a55bd34..02f4a9e 100644
--- a/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/core/server/impl/QueueConcurrentTest.java
+++ b/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/core/server/impl/QueueConcurrentTest.java
@@ -105,8 +105,6 @@ public class QueueConcurrentTest extends ActiveMQTestBase {
 
    }
 
-   // Inner classes ---------------------------------------------------------------
-
    class Sender extends Thread {
 
       private volatile Exception e;
diff --git a/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java b/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java
index c527ced..c1e0d03 100644
--- a/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java
+++ b/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java
@@ -180,7 +180,6 @@ public class JMSBridgeImplTest extends ActiveMQTestBase {
    }
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testStartWithRepeatedFailure() throws Exception {
@@ -675,9 +674,7 @@ public class JMSBridgeImplTest extends ActiveMQTestBase {
       }
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
    private static MockContextClassLoader setMockTCCL() {
       ClassLoader parent = JMSBridgeImpl.class.getClassLoader();
       MockContextClassLoader tccl = new MockContextClassLoader(parent);
@@ -766,9 +763,7 @@ public class JMSBridgeImplTest extends ActiveMQTestBase {
       bridge.stop();
       Assert.assertFalse(bridge.isStarted());
    }
-   // Private -------------------------------------------------------
 
-   // Inner classes -------------------------------------------------
    private static class MockContextClassLoader extends ClassLoader {
 
       private final ClassLoader original;
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/client/impl/LargeMessageBufferTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/client/impl/LargeMessageBufferTest.java
index 8d6419e..54a9bdc 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/client/impl/LargeMessageBufferTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/client/impl/LargeMessageBufferTest.java
@@ -56,7 +56,6 @@ public class LargeMessageBufferTest extends ActiveMQTestBase {
 
    static int tmpFileCounter = 0;
 
-   // Public --------------------------------------------------------
 
    @Override
    @Before
@@ -629,14 +628,6 @@ public class LargeMessageBufferTest extends ActiveMQTestBase {
       }
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
    static class FakeConsumerInternal implements ClientConsumerInternal {
 
       @Override
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/config/impl/ConfigurationValidationTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/config/impl/ConfigurationValidationTest.java
index 298d23c..0a690c2 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/config/impl/ConfigurationValidationTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/config/impl/ConfigurationValidationTest.java
@@ -37,7 +37,6 @@ public class ConfigurationValidationTest extends ActiveMQTestBase {
    }
 
 
-   // Public --------------------------------------------------------
 
    /**
     * test does not pass in eclipse (because it can not find artemis-configuration.xsd).
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/config/impl/TransportConfigurationTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/config/impl/TransportConfigurationTest.java
index 99f9c0d..558210a 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/config/impl/TransportConfigurationTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/config/impl/TransportConfigurationTest.java
@@ -30,7 +30,6 @@ import org.junit.Test;
 public class TransportConfigurationTest extends ActiveMQTestBase {
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testSplitNullAddress() throws Exception {
@@ -128,12 +127,4 @@ public class TransportConfigurationTest extends ActiveMQTestBase {
       TransportConfiguration tc2 = new TransportConfiguration(NettyConnectorFactory.class.getName(), params2);
       Assert.assertTrue(TransportConfigurationUtil.isSameHost(tc1, tc2));
    }
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/AlignedJournalImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/AlignedJournalImplTest.java
index 49453c3..884760b 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/AlignedJournalImplTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/AlignedJournalImplTest.java
@@ -85,7 +85,6 @@ public class AlignedJournalImplTest extends ActiveMQTestBase {
    private ArrayList<PreparedTransactionInfo> transactions = null;
 
 
-   // Public --------------------------------------------------------
 
    // This test just validates basic alignment on the FakeSequentialFile itself
    @Test
@@ -1259,9 +1258,7 @@ public class AlignedJournalImplTest extends ActiveMQTestBase {
 
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
    @Override
    @Before
@@ -1299,7 +1296,6 @@ public class AlignedJournalImplTest extends ActiveMQTestBase {
       super.tearDown();
    }
 
-   // Private -------------------------------------------------------
 
    private void setupAndLoadJournal(final int journalSize, final int alignment) throws Exception {
       setupAndLoadJournal(journalSize, alignment, 2);
@@ -1336,6 +1332,5 @@ public class AlignedJournalImplTest extends ActiveMQTestBase {
       });
    }
 
-   // Inner classes -------------------------------------------------
 
 }
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/CleanBufferTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/CleanBufferTest.java
index 8246d4d..bd9ca62 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/CleanBufferTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/CleanBufferTest.java
@@ -31,7 +31,6 @@ import org.junit.Test;
 public class CleanBufferTest extends ActiveMQTestBase {
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testCleanOnNIO() {
@@ -90,12 +89,4 @@ public class CleanBufferTest extends ActiveMQTestBase {
       }
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalAsyncTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalAsyncTest.java
index fbe843c..0162f32 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalAsyncTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalAsyncTest.java
@@ -44,7 +44,6 @@ public class JournalAsyncTest extends ActiveMQTestBase {
    private ArrayList<PreparedTransactionInfo> transactions = null;
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testAsynchronousCommit() throws Exception {
@@ -286,9 +285,7 @@ public class JournalAsyncTest extends ActiveMQTestBase {
 
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
    @Override
    @Before
@@ -318,7 +315,6 @@ public class JournalAsyncTest extends ActiveMQTestBase {
       super.tearDown();
    }
 
-   // Private -------------------------------------------------------
    private void setupJournal(final int journalSize,
                              final int alignment,
                              final int numberOfMinimalFiles) throws Exception {
@@ -340,6 +336,5 @@ public class JournalAsyncTest extends ActiveMQTestBase {
       journalImpl.load(records, transactions, null);
    }
 
-   // Inner classes -------------------------------------------------
 
 }
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/SequentialFileFactoryTestBase.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/SequentialFileFactoryTestBase.java
index b45c74a..a3adc82 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/SequentialFileFactoryTestBase.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/SequentialFileFactoryTestBase.java
@@ -380,8 +380,6 @@ public abstract class SequentialFileFactoryTestBase extends ActiveMQTestBase {
       sf.close();
    }
 
-   // Private ---------------------------------
-
    private ActiveMQBuffer wrapBuffer(final byte[] bytes) {
       return ActiveMQBuffers.wrappedBuffer(bytes);
    }
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/TimedBufferTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/TimedBufferTest.java
index 66e6933..14f667c 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/TimedBufferTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/TimedBufferTest.java
@@ -45,7 +45,6 @@ public class TimedBufferTest extends ActiveMQTestBase {
    private static final int ONE_SECOND_IN_NANOS = 1000000000; // in nanoseconds
 
 
-   // Public --------------------------------------------------------
 
    IOCallback dummyCallback = new IOCallback() {
 
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java
index 8c0a1f7..f393ad7 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java
@@ -88,7 +88,6 @@ public class FakeSequentialFileFactory implements SequentialFileFactory {
       this.writeDirectCallback = writeDirectCallback;
    }
 
-   // Public --------------------------------------------------------
 
    @Override
    public SequentialFile createSequentialFile(final String fileName) {
@@ -218,17 +217,13 @@ public class FakeSequentialFileFactory implements SequentialFileFactory {
       return this;
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
    protected FakeSequentialFile newSequentialFile(final String fileName) {
       return new FakeSequentialFile(fileName);
    }
 
-   // Private -------------------------------------------------------
 
-   // Inner classes -------------------------------------------------
 
    /**
     * This listener will return a message to the test with each callback added
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/fakes/SimpleEncoding.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/fakes/SimpleEncoding.java
index 347c62e..81cc3b6 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/fakes/SimpleEncoding.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/fakes/SimpleEncoding.java
@@ -34,7 +34,6 @@ public class SimpleEncoding implements EncodingSupport {
       this.bytetosend = bytetosend;
    }
 
-   // Public --------------------------------------------------------
    @Override
    public void decode(final ActiveMQBuffer buffer) {
       throw new UnsupportedOperationException();
@@ -53,12 +52,4 @@ public class SimpleEncoding implements EncodingSupport {
       return size;
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/message/impl/MessageImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/message/impl/MessageImplTest.java
index 04dcbf3..5b93c81 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/message/impl/MessageImplTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/message/impl/MessageImplTest.java
@@ -459,7 +459,4 @@ public class MessageImplTest extends ActiveMQTestBase {
       assertNotNull(msg1);
    }
 
-   // Protected -------------------------------------------------------------------------------
-   // Private ----------------------------------------------------------------------------------
-
 }
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PagePositionTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PagePositionTest.java
index 23b76a3..de7c66b 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PagePositionTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PagePositionTest.java
@@ -22,19 +22,10 @@ import org.junit.Test;
 public class PagePositionTest extends ActiveMQTestBase {
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testNextSequenceOf() {
 
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PageTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PageTest.java
index 9f2ffa4..06c3311 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PageTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PageTest.java
@@ -49,7 +49,6 @@ import org.junit.Test;
 
 public class PageTest extends ActiveMQTestBase {
 
-   // Public --------------------------------------------------------
 
    @Before
    public void registerProtocols() {
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java
index a61a55c..7c01d72 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java
@@ -71,7 +71,6 @@ public class DuplicateDetectionUnitTest extends ActiveMQTestBase {
       factory = new OrderedExecutorFactory(executor);
    }
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testReloadDuplication() throws Exception {
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/ActiveMQBufferTestBase.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/ActiveMQBufferTestBase.java
index 02cecbd..78ea231 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/ActiveMQBufferTestBase.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/ActiveMQBufferTestBase.java
@@ -27,7 +27,6 @@ import org.junit.Test;
 
 public abstract class ActiveMQBufferTestBase extends ActiveMQTestBase {
 
-   // Public --------------------------------------------------------
 
    private ActiveMQBuffer wrapper;
 
@@ -332,11 +331,8 @@ public abstract class ActiveMQBufferTestBase extends ActiveMQTestBase {
       Assert.assertEquals(0, wrapper.writerIndex());
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
-   // Private -------------------------------------------------------
 
    private String putAndGetNullableString(final String nullableString) throws Exception {
       wrapper.writeNullableString(nullableString);
@@ -350,5 +346,4 @@ public abstract class ActiveMQBufferTestBase extends ActiveMQTestBase {
       return wrapper.readNullableSimpleString();
    }
 
-   // Inner classes -------------------------------------------------
 }
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/ChannelBufferWrapper2Test.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/ChannelBufferWrapper2Test.java
index d19e16d..632b064 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/ChannelBufferWrapper2Test.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/ChannelBufferWrapper2Test.java
@@ -26,7 +26,6 @@ import org.apache.activemq.artemis.tests.unit.core.remoting.ActiveMQBufferTestBa
 public class ChannelBufferWrapper2Test extends ActiveMQBufferTestBase {
 
 
-   // Public --------------------------------------------------------
 
    // BufferWrapperBase overrides -----------------------------------
 
@@ -35,11 +34,5 @@ public class ChannelBufferWrapper2Test extends ActiveMQBufferTestBase {
       return ActiveMQBuffers.dynamicBuffer(512);
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
 }
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java
index 7a874e3..7ac846a 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java
@@ -78,7 +78,6 @@ public class SSLSupportTest extends ActiveMQTestBase {
 
 
 
-   // Public --------------------------------------------------------
 
    @Override
    @Before
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/group/impl/SystemPropertyOverrideTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/group/impl/SystemPropertyOverrideTest.java
index 33ecb2f..5a002cc 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/group/impl/SystemPropertyOverrideTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/group/impl/SystemPropertyOverrideTest.java
@@ -24,7 +24,6 @@ import org.junit.Test;
 public class SystemPropertyOverrideTest extends ActiveMQTestBase {
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testSystemPropertyOverride() throws Exception {
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/QueueImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/QueueImplTest.java
index ae04068..97b9a8b 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/QueueImplTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/QueueImplTest.java
@@ -1082,8 +1082,6 @@ public class QueueImplTest extends ActiveMQTestBase {
       }
    }
 
-   // Private ------------------------------------------------------------------------------
-
    private void testConsumerWithFilters(final boolean direct) throws Exception {
       QueueImpl queue = getTemporaryQueue();
 
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/ActiveMQDestinationTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/ActiveMQDestinationTest.java
index 330bec7..9c6ae10 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/ActiveMQDestinationTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/ActiveMQDestinationTest.java
@@ -34,7 +34,6 @@ import static org.apache.activemq.artemis.jms.client.ActiveMQDestination.TOPIC_Q
 public class ActiveMQDestinationTest extends ActiveMQTestBase {
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testEquals() throws Exception {
@@ -97,11 +96,5 @@ public class ActiveMQDestinationTest extends ActiveMQTestBase {
       }
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
 }
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/ActiveMQMapMessageTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/ActiveMQMapMessageTest.java
index f0a37ba..bf113d9 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/ActiveMQMapMessageTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/ActiveMQMapMessageTest.java
@@ -39,7 +39,6 @@ public class ActiveMQMapMessageTest extends ActiveMQTestBase {
    }
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testClearBody() throws Exception {
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/ActiveMQStreamMessageTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/ActiveMQStreamMessageTest.java
index 253900d..d019077 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/ActiveMQStreamMessageTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/ActiveMQStreamMessageTest.java
@@ -29,7 +29,6 @@ import org.junit.Test;
 public class ActiveMQStreamMessageTest extends ActiveMQTestBase {
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testGetType() throws Exception {
@@ -871,7 +870,6 @@ public class ActiveMQStreamMessageTest extends ActiveMQTestBase {
       Assert.assertEquals(value, message.readObject());
    }
 
-   // Private -------------------------------------------------------
 
    private void doReadTypeFromEmptyMessage(final TypeReader reader) throws Exception {
       ActiveMQStreamMessage message = new ActiveMQStreamMessage();
@@ -911,7 +909,6 @@ public class ActiveMQStreamMessageTest extends ActiveMQTestBase {
       }
    }
 
-   // Inner classes -------------------------------------------------
 
    private interface TypeReader {
 
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/JMSExceptionHelperTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/JMSExceptionHelperTest.java
index 1cd0d39..945b647 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/JMSExceptionHelperTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/JMSExceptionHelperTest.java
@@ -36,7 +36,6 @@ import static org.apache.activemq.artemis.api.core.ActiveMQExceptionType.INVALID
 public class JMSExceptionHelperTest extends ActiveMQTestBase {
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testCONNECTION_TIMEDOUT() throws Exception {
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/SelectorTranslatorTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/SelectorTranslatorTest.java
index cc8667b..bdfc611 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/SelectorTranslatorTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/client/SelectorTranslatorTest.java
@@ -235,8 +235,6 @@ public class SelectorTranslatorTest extends ActiveMQTestBase {
       Assert.assertEquals("AMQExpiration=12345678", SelectorTranslator.convertHQToActiveMQFilterString(selector));
    }
 
-   // Private -------------------------------------------------------------------------------------
-
    private void checkNoSubstitute(final String fieldName) {
       String selector = "Other" + fieldName + " = 767868";
 
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/misc/ManifestTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/misc/ManifestTest.java
index a4f858f..c5a9d08 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/misc/ManifestTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/misc/ManifestTest.java
@@ -36,7 +36,6 @@ public class ManifestTest extends ActiveMQTestBase {
    private static final Logger log = Logger.getLogger(ManifestTest.class);
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testManifestEntries() throws Exception {
@@ -63,7 +62,5 @@ public class ManifestTest extends ActiveMQTestBase {
       Assert.assertEquals(meta.getProviderVersion(), attrs.getValue("ActiveMQ-Version"));
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 }
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/ResourceAdapterTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/ResourceAdapterTest.java
index 259201b..fa71e1e 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/ResourceAdapterTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/ResourceAdapterTest.java
@@ -47,7 +47,6 @@ import org.junit.Test;
 public class ResourceAdapterTest extends ActiveMQTestBase {
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testDefaultConnectionFactory() throws Exception {
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/referenceable/DestinationObjectFactoryTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/referenceable/DestinationObjectFactoryTest.java
index b98977f..5e21ffb 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/referenceable/DestinationObjectFactoryTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/referenceable/DestinationObjectFactoryTest.java
@@ -29,7 +29,6 @@ import org.junit.Test;
 public class DestinationObjectFactoryTest extends ActiveMQTestBase {
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testReference() throws Exception {
@@ -44,11 +43,5 @@ public class DestinationObjectFactoryTest extends ActiveMQTestBase {
       Assert.assertEquals(queue, object);
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
 }
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/InVMContext.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/InVMContext.java
index fec067a..0fa57c4 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/InVMContext.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/InVMContext.java
@@ -262,13 +262,9 @@ public class InVMContext implements Context, Serializable {
       return nameInNamespace;
    }
 
-   // Public --------------------------------------------------------
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
-   // Private -------------------------------------------------------
 
    private String trimSlashes(String s) {
       int i = 0;
@@ -305,7 +301,6 @@ public class InVMContext implements Context, Serializable {
       c.map.put(name, obj);
    }
 
-   // Inner classes -------------------------------------------------
 
    private class NamingEnumerationImpl<T> implements NamingEnumeration<T> {
 
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/InVMNameParser.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/InVMNameParser.java
index bf41d35..88b6019 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/InVMNameParser.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/InVMNameParser.java
@@ -40,7 +40,6 @@ public class InVMNameParser implements NameParser, Serializable {
 
 
 
-   // Public --------------------------------------------------------
 
    public static Properties getSyntax() {
       return InVMNameParser.syntax;
@@ -51,12 +50,4 @@ public class InVMNameParser implements NameParser, Serializable {
       return new CompoundName(name, InVMNameParser.syntax);
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/InVMNamingContext.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/InVMNamingContext.java
index 37a91c3..65b4baf 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/InVMNamingContext.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/InVMNamingContext.java
@@ -262,13 +262,9 @@ public class InVMNamingContext implements Context, Serializable {
       return nameInNamespace;
    }
 
-   // Public --------------------------------------------------------
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
-   // Private -------------------------------------------------------
 
    private String trimSlashes(String s) {
       int i = 0;
@@ -305,7 +301,6 @@ public class InVMNamingContext implements Context, Serializable {
       c.map.put(name, obj);
    }
 
-   // Inner classes -------------------------------------------------
 
    private class NamingEnumerationImpl<T> implements NamingEnumeration<T> {
 
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/ObjectInputStreamWithClassLoaderTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/ObjectInputStreamWithClassLoaderTest.java
index 8c62398..981cbe8 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/ObjectInputStreamWithClassLoaderTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/ObjectInputStreamWithClassLoaderTest.java
@@ -81,7 +81,6 @@ public class ObjectInputStreamWithClassLoaderTest extends ActiveMQTestBase {
       return appClassLoader;
    }
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testClassLoaderIsolation() throws Exception {
@@ -469,11 +468,8 @@ public class ObjectInputStreamWithClassLoaderTest extends ActiveMQTestBase {
       return result;
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
 
-   // Private -------------------------------------------------------
 
    public static class ProxyReader implements Runnable {
 
@@ -532,7 +528,6 @@ public class ObjectInputStreamWithClassLoaderTest extends ActiveMQTestBase {
       return baos.toByteArray();
    }
 
-   // Inner classes -------------------------------------------------
 
    private interface AnObject extends Serializable {
 
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/SoftValueMapTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/SoftValueMapTest.java
index 96cd01d..531f14c 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/SoftValueMapTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/SoftValueMapTest.java
@@ -25,7 +25,6 @@ public class SoftValueMapTest extends ActiveMQTestBase {
    private static final Logger log = Logger.getLogger(SoftValueMapTest.class);
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testEvictions() {
@@ -128,12 +127,4 @@ public class SoftValueMapTest extends ActiveMQTestBase {
       }
    }
 
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
 }
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/UUIDGeneratorTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/UUIDGeneratorTest.java
index d18fe81..cb93c0c 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/UUIDGeneratorTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/UUIDGeneratorTest.java
@@ -28,7 +28,6 @@ import java.util.UUID;
 public class UUIDGeneratorTest extends ActiveMQTestBase {
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testFromJavaUUID() throws Exception {
@@ -78,11 +77,5 @@ public class UUIDGeneratorTest extends ActiveMQTestBase {
       ActiveMQTestBase.assertEqualsByteArrays(new byte[]{1, 2, 3, 0, 0, 0}, zeroPaddedThreeBytes);
    }
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
 }
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/VersionLoaderTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/VersionLoaderTest.java
index 32b6370..4fba4ef 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/VersionLoaderTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/VersionLoaderTest.java
@@ -28,7 +28,6 @@ import org.junit.Test;
 public class VersionLoaderTest extends ActiveMQTestBase {
 
 
-   // Public --------------------------------------------------------
 
    @Test
    public void testLoadVersion() throws Exception {
@@ -48,11 +47,5 @@ public class VersionLoaderTest extends ActiveMQTestBase {
 
    // Y overrides ---------------------------------------------------
 
-   // Package protected ---------------------------------------------
 
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
 }