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:48 UTC

[activemq-artemis] 01/03: ARTEMIS-3538: Removing // --------- comments from the codebase

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 923e4cc8926875c35fd30fdc1b48f2fead5c88e0
Author: Asukwo-comfort <as...@gmail.com>
AuthorDate: Tue Nov 2 23:18:48 2021 +0100

    ARTEMIS-3538: Removing // --------- comments from the codebase
---
 .../java/org/apache/activemq/artemis/api/core/SimpleString.java  | 6 ------
 .../main/java/org/apache/activemq/artemis/utils/RandomUtil.java  | 7 ++-----
 .../org/apache/activemq/artemis/utils/ConcurrentHashSetTest.java | 5 -----
 .../activemq/artemis/utils/TypedPropertiesConversionTest.java    | 7 -------
 .../org/apache/activemq/artemis/utils/TypedPropertiesTest.java   | 2 +-
 .../artemis/api/core/management/AddressSettingsInfo.java         | 2 --
 .../activemq/artemis/api/core/management/DayCounterInfo.java     | 2 --
 .../activemq/artemis/api/core/management/ManagementHelper.java   | 4 ----
 .../activemq/artemis/api/core/management/MessageCounterInfo.java | 1 -
 .../activemq/artemis/api/core/management/ObjectNameBuilder.java  | 5 +----
 .../activemq/artemis/core/client/impl/ClientConsumerImpl.java    | 9 ++-------
 .../activemq/artemis/core/client/impl/ClientProducerImpl.java    | 3 ---
 .../artemis/core/client/impl/LargeMessageControllerImpl.java     | 5 -----
 .../activemq/artemis/core/protocol/core/impl/PacketImpl.java     | 4 ++--
 .../artemis/core/protocol/core/impl/RemotingConnectionImpl.java  | 2 --
 .../protocol/core/impl/wireformat/ActiveMQExceptionMessage.java  | 3 ---
 .../core/impl/wireformat/ActiveMQExceptionMessage_V2.java        | 2 --
 .../core/impl/wireformat/ClusterTopologyChangeMessage.java       | 3 ---
 .../core/protocol/core/impl/wireformat/DisconnectMessage.java    | 5 -----
 .../core/protocol/core/impl/wireformat/SessionExpireMessage.java | 5 -----
 .../impl/wireformat/SessionIndividualAcknowledgeMessage.java     | 5 -----
 .../core/impl/wireformat/SessionReceiveContinuationMessage.java  | 5 -----
 .../protocol/core/impl/wireformat/SessionReceiveMessage.java     | 3 ---
 .../core/impl/wireformat/SessionSendContinuationMessage.java     | 2 --
 .../core/impl/wireformat/SessionSendContinuationMessage_V2.java  | 2 --
 .../protocol/core/impl/wireformat/SessionSendLargeMessage.java   | 3 ---
 .../core/impl/wireformat/SessionUniqueAddMetaDataMessage.java    | 7 -------
 .../core/impl/wireformat/SessionXAAfterFailedMessage.java        | 5 -----
 .../protocol/core/impl/wireformat/SessionXAStartMessage.java     | 5 -----
 .../artemis/core/remoting/impl/netty/NettyConnector.java         | 6 ------
 .../apache/activemq/artemis/core/transaction/impl/XidImpl.java   | 3 +--
 .../apache/activemq/artemis/core/version/impl/VersionImpl.java   | 2 +-
 .../apache/activemq/artemis/utils/ActiveMQBufferInputStream.java | 5 -----
 .../main/java/org/apache/activemq/artemis/utils/JNDIUtil.java    | 6 ------
 .../activemq/artemis/utils/ObjectInputStreamWithClassLoader.java | 5 -----
 .../org/apache/activemq/artemis/utils/SizeFormatterUtil.java     | 6 ------
 .../activemq/artemis/utils/SoftValueLongObjectHashMap.java       | 6 +-----
 .../apache/activemq/artemis/utils/TimeAndCounterIDGenerator.java | 6 +-----
 .../java/org/apache/activemq/artemis/utils/XidCodecSupport.java  | 6 ------
 .../activemq/artemis/util/TimeAndCounterIDGeneratorTest.java     | 8 --------
 .../test/java/org/apache/activemq/artemis/util/XMLUtilTest.java  | 2 +-
 .../apache/activemq/artemis/jms/client/ActiveMQBytesMessage.java | 3 ---
 .../apache/activemq/artemis/jms/client/ActiveMQConnection.java   | 6 +-----
 .../activemq/artemis/jms/client/ActiveMQConnectionMetaData.java  | 6 +-----
 .../apache/activemq/artemis/jms/client/ActiveMQDestination.java  | 5 +----
 .../apache/activemq/artemis/jms/client/ActiveMQMapMessage.java   | 5 -----
 .../org/apache/activemq/artemis/jms/client/ActiveMQMessage.java  | 4 ----
 .../activemq/artemis/jms/client/ActiveMQMessageConsumer.java     | 2 +-
 .../activemq/artemis/jms/client/ActiveMQMessageProducer.java     | 1 -
 .../activemq/artemis/jms/client/ActiveMQObjectMessage.java       | 6 +-----
 .../org/apache/activemq/artemis/jms/client/ActiveMQQueue.java    | 5 -----
 .../apache/activemq/artemis/jms/client/ActiveMQQueueBrowser.java | 6 +-----
 .../org/apache/activemq/artemis/jms/client/ActiveMQSession.java  | 1 -
 .../activemq/artemis/jms/client/ActiveMQTemporaryQueue.java      | 7 +------
 .../activemq/artemis/jms/client/ActiveMQTemporaryTopic.java      | 5 -----
 .../apache/activemq/artemis/jms/client/ActiveMQTextMessage.java  | 5 -----
 .../org/apache/activemq/artemis/jms/client/ActiveMQTopic.java    | 6 +-----
 .../activemq/artemis/jms/bridge/impl/JMSBridgeControlImpl.java   | 6 ------
 .../artemis/jms/persistence/config/PersistedBindings.java        | 6 ------
 .../jms/persistence/config/PersistedConnectionFactory.java       | 6 ------
 .../artemis/jms/persistence/config/PersistedDestination.java     | 6 ------
 .../persistence/impl/journal/JMSJournalStorageManagerImpl.java   | 5 +----
 .../server/config/impl/ConnectionFactoryConfigurationImpl.java   | 6 ------
 .../jms/server/config/impl/JMSQueueConfigurationImpl.java        | 6 ------
 .../artemis/jms/server/config/impl/TopicConfigurationImpl.java   | 7 -------
 .../config/impl/TransportConfigurationEncodingSupport.java       | 7 -------
 .../org/apache/activemq/artemis/core/io/buffer/TimedBuffer.java  | 7 ++-----
 .../artemis/core/journal/impl/AbstractJournalUpdateTask.java     | 6 ------
 .../apache/activemq/artemis/core/journal/impl/JournalImpl.java   | 4 ++--
 .../activemq/artemis/core/journal/impl/SyncIOCompletion.java     | 7 -------
 .../amqp/converter/coreWrapper/CoreTextMessageWrapper.java       | 5 +----
 .../artemis/core/protocol/stomp/StompProtocolManager.java        | 2 --
 .../apache/activemq/artemis/core/protocol/stomp/StompUtils.java  | 5 -----
 .../java/org/apache/activemq/artemis/ra/ActiveMQRAService.java   | 4 ----
 .../activemq/artemis/core/config/impl/ConfigurationImpl.java     | 3 ---
 .../artemis/core/deployers/impl/FileConfigurationParser.java     | 1 -
 .../org/apache/activemq/artemis/core/filter/impl/FilterImpl.java | 4 ----
 .../activemq/artemis/core/management/impl/AbstractControl.java   | 6 ------
 .../artemis/core/management/impl/AcceptorControlImpl.java        | 6 ------
 .../artemis/core/management/impl/ActiveMQServerControlImpl.java  | 3 +--
 .../artemis/core/management/impl/AddressControlImpl.java         | 6 ------
 .../core/management/impl/BaseBroadcastGroupControlImpl.java      | 7 -------
 .../activemq/artemis/core/management/impl/BridgeControlImpl.java | 6 ------
 .../artemis/core/management/impl/BroadcastGroupControlImpl.java  | 5 -----
 .../core/management/impl/ClusterConnectionControlImpl.java       | 4 ----
 .../activemq/artemis/core/management/impl/DivertControlImpl.java | 6 ------
 .../management/impl/JGroupsChannelBroadcastGroupControlImpl.java | 7 -------
 .../management/impl/JGroupsFileBroadcastGroupControlImpl.java    | 5 -----
 .../impl/JGroupsPropertiesBroadcastGroupControlImpl.java         | 6 ------
 .../activemq/artemis/core/management/impl/MBeanInfoHelper.java   | 6 ------
 .../activemq/artemis/core/management/impl/QueueControlImpl.java  | 6 ------
 .../activemq/artemis/core/messagecounter/MessageCounter.java     | 5 -----
 .../artemis/core/messagecounter/impl/MessageCounterHelper.java   | 6 ------
 .../artemis/core/paging/cursor/impl/PageCursorProviderImpl.java  | 5 +----
 .../java/org/apache/activemq/artemis/core/paging/impl/Page.java  | 2 --
 .../apache/activemq/artemis/core/paging/impl/PageSyncTimer.java  | 5 -----
 .../artemis/core/paging/impl/PageTransactionInfoImpl.java        | 6 ------
 .../activemq/artemis/core/paging/impl/PagingManagerImpl.java     | 4 ----
 .../artemis/core/paging/impl/PagingStoreFactoryDatabase.java     | 3 +--
 .../activemq/artemis/core/paging/impl/PagingStoreFactoryNIO.java | 2 --
 .../artemis/core/persistence/config/PersistedAddressSetting.java | 5 -----
 .../core/persistence/config/PersistedSecuritySetting.java        | 6 ------
 .../core/persistence/impl/journal/LargeServerMessageImpl.java    | 2 --
 .../core/protocol/core/impl/wireformat/NodeAnnounceMessage.java  | 2 --
 .../artemis/core/remoting/server/impl/RemotingServiceImpl.java   | 5 -----
 .../activemq/artemis/core/replication/ReplicationEndpoint.java   | 2 +-
 .../activemq/artemis/core/security/impl/SecurityStoreImpl.java   | 1 -
 .../activemq/artemis/core/server/cluster/impl/BridgeImpl.java    | 4 ++--
 .../activemq/artemis/core/server/impl/MessageReferenceImpl.java  | 2 --
 .../activemq/artemis/core/server/impl/ServerConsumerImpl.java    | 6 +-----
 .../activemq/artemis/core/server/impl/ServerSessionImpl.java     | 4 +---
 .../core/server/management/impl/ManagementServiceImpl.java       | 4 ----
 .../apache/activemq/artemis/core/config/impl/ValidatorsTest.java | 1 -
 .../java/org/apache/activemq/artemis/core/security/RoleTest.java | 6 ------
 .../activemq/artemis/core/version/impl/VersionImplTest.java      | 7 -------
 .../apache/activemq/artemis/jms/example/TextReverserService.java | 6 ------
 .../java/org/apache/activemq/artemis/jms/example/DummyXid.java   | 3 +--
 .../java/org/apache/activemq/artemis/jms/example/DummyXid.java   | 4 ++--
 .../java/org/apache/activemq/artemis/jms/example/DummyXid.java   | 3 ---
 .../apache/activemq/broker/artemiswrapper/InVMNameParser.java    | 5 -----
 .../apache/activemq/broker/artemiswrapper/InVMNamingContext.java | 4 ----
 .../org/apache/activemq/artemis/tests/extras/jms/xa/XATest.java  | 5 -----
 .../artemis/tests/integration/SimpleNotificationService.java     | 6 ------
 .../activemq/artemis/tests/integration/String64KLimitTest.java   | 5 -----
 .../artemis/tests/integration/client/BlockingSendTest.java       | 7 -------
 .../artemis/tests/integration/client/ConsumerCloseTest.java      | 2 --
 .../artemis/tests/integration/client/DurableQueueTest.java       | 6 ------
 .../artemis/tests/integration/client/ExpiryLargeMessageTest.java | 7 +------
 .../artemis/tests/integration/client/HeuristicXATest.java        | 7 -------
 .../tests/integration/client/IncompatibleVersionTest.java        | 5 -----
 .../tests/integration/client/InterruptedLargeMessageTest.java    | 2 +-
 .../artemis/tests/integration/client/JmsNettyNioStressTest.java  | 7 -------
 .../tests/integration/client/LargeMessageCompressTest.java       | 2 +-
 .../tests/integration/client/LibaioDependencyCheckTest.java      | 7 -------
 .../tests/integration/client/MessageConsumerRollbackTest.java    | 7 -------
 .../artemis/tests/integration/client/MessageDurabilityTest.java  | 6 ------
 .../artemis/tests/integration/client/MessagePriorityTest.java    | 6 ------
 .../artemis/tests/integration/client/MessageRateTest.java        | 6 ------
 .../artemis/tests/integration/client/MixRoutingTest.java         | 6 +-----
 .../tests/integration/client/MultipleThreadFilterOneTest.java    | 7 +------
 .../activemq/artemis/tests/integration/client/NIOvsOIOTest.java  | 7 -------
 .../tests/integration/client/NettyConsumerWindowSizeTest.java    | 6 ------
 .../activemq/artemis/tests/integration/client/OrderTest.java     | 3 ---
 .../artemis/tests/integration/client/RedeliveryConsumerTest.java | 6 ------
 .../artemis/tests/integration/client/SessionCloseTest.java       | 5 -----
 .../artemis/tests/integration/clientcrash/ClientCrashTest.java   | 5 -----
 .../artemis/tests/integration/clientcrash/ClientExitTest.java    | 8 ++------
 .../artemis/tests/integration/clientcrash/CrashClient.java       | 6 ------
 .../artemis/tests/integration/clientcrash/CrashClient2.java      | 6 ------
 .../artemis/tests/integration/clientcrash/GracefulClient.java    | 6 ------
 .../cluster/distribution/SimpleSymmetricClusterTest.java         | 6 ------
 .../distribution/TwoWayTwoNodeClusterWithDiscoveryTest.java      | 6 ------
 .../tests/integration/cluster/failover/FailoverTestBase.java     | 2 --
 .../cluster/failover/MultipleServerFailoverTestBase.java         | 3 +--
 .../tests/integration/cluster/failover/PagingFailoverTest.java   | 6 +-----
 .../cluster/reattach/MultiThreadRandomReattachTestBase.java      | 5 -----
 .../tests/integration/cluster/reattach/OrderReattachTest.java    | 5 -----
 .../tests/integration/cluster/reattach/RandomReattachTest.java   | 5 -----
 .../activemq/artemis/tests/integration/jms/FloodServerTest.java  | 7 +------
 .../integration/jms/ManualReconnectionToSingleServerTest.java    | 2 +-
 .../artemis/tests/integration/jms/client/CreateQueueTest.java    | 6 ------
 .../artemis/tests/integration/jms/client/ExpiryMessageTest.java  | 6 ------
 .../artemis/tests/integration/jms/client/MessageTest.java        | 7 +------
 .../tests/integration/jms/client/NoLocalSubscriberTest.java      | 7 -------
 .../artemis/tests/integration/jms/client/PreACKJMSTest.java      | 6 ------
 .../artemis/tests/integration/jms/client/ReSendMessageTest.java  | 6 ------
 .../jms/client/SessionClosedOnRemotingConnectionFailureTest.java | 6 ------
 .../artemis/tests/integration/jms/client/TextMessageTest.java    | 6 ------
 .../tests/integration/jms/cluster/JMSFailoverListenerTest.java   | 6 ------
 .../artemis/tests/integration/jms/cluster/JMSFailoverTest.java   | 6 ------
 .../tests/integration/jms/cluster/TemporaryQueueClusterTest.java | 7 -------
 .../artemis/tests/integration/jms/cluster/TopicClusterTest.java  | 6 ------
 .../jms/connection/ConnectionFactorySerializationTest.java       | 5 -----
 .../tests/integration/jms/largemessage/JMSLargeMessageTest.java  | 4 ----
 .../tests/integration/jms/server/JMSServerDeployerTest.java      | 7 +------
 .../integration/jms/server/config/JMSServerConfigParserTest.java | 6 ------
 .../artemis/tests/integration/jms/server/management/JMSUtil.java | 6 ------
 .../artemis/tests/integration/journal/NIOImportExportTest.java   | 7 -------
 .../tests/integration/largemessage/LargeMessageTestBase.java     | 5 -----
 .../tests/integration/largemessage/ServerLargeMessageTest.java   | 7 +------
 .../tests/integration/management/AcceptorControlTest.java        | 2 --
 .../integration/management/AcceptorControlUsingCoreTest.java     | 7 -------
 .../tests/integration/management/ActiveMQServerControlTest.java  | 5 -----
 .../management/ActiveMQServerControlUsingCoreTest.java           | 7 -------
 .../integration/management/AddressControlUsingCoreTest.java      | 7 -------
 .../tests/integration/management/BridgeControlUsingCoreTest.java | 6 ------
 .../integration/management/ClusterConnectionControl2Test.java    | 5 +----
 .../integration/management/ClusterConnectionControlTest.java     | 5 -----
 .../management/ClusterConnectionControlUsingCoreTest.java        | 8 --------
 .../artemis/tests/integration/management/CoreMessagingProxy.java | 6 ------
 .../artemis/tests/integration/management/DivertControlTest.java  | 4 ----
 .../tests/integration/management/DivertControlUsingCoreTest.java | 7 -------
 .../tests/integration/management/ManagementControlHelper.java    | 6 +-----
 .../tests/integration/management/ManagementHelperTest.java       | 7 -------
 .../artemis/tests/integration/management/ManagementTestBase.java | 7 ++-----
 .../artemis/tests/integration/management/NotificationTest.java   | 5 -----
 .../tests/integration/management/SecurityManagementTestBase.java | 6 ------
 .../SecurityManagementWithConfiguredAdminUserTest.java           | 4 ----
 .../SecurityManagementWithModifiedConfigurationTest.java         | 6 ------
 .../tests/integration/management/SecurityNotificationTest.java   | 6 ------
 .../artemis/tests/integration/paging/PagingCounterTest.java      | 5 -----
 .../artemis/tests/integration/paging/PagingOrderTest.java        | 3 ---
 .../artemis/tests/integration/paging/PagingSyncTest.java         | 2 --
 .../tests/integration/persistence/DeleteQueueRestartTest.java    | 7 +------
 .../artemis/tests/integration/persistence/ExportFormatTest.java  | 3 ---
 .../tests/integration/persistence/JMSDynamicConfigTest.java      | 7 -------
 .../tests/integration/persistence/QueueConfigRestartTest.java    | 6 ------
 .../artemis/tests/integration/persistence/RestartSMTest.java     | 4 ----
 .../persistence/TransportConfigurationEncodingSupportTest.java   | 8 --------
 .../artemis/tests/integration/ra/ActiveMQActivationTest.java     | 7 -------
 .../artemis/tests/integration/remoting/DestroyConsumerTest.java  | 7 -------
 .../tests/integration/remoting/NetworkAddressTestBase.java       | 6 ------
 .../activemq/artemis/tests/integration/remoting/PingTest.java    | 5 -----
 .../artemis/tests/integration/remoting/SynchronousCloseTest.java | 3 ---
 .../apache/activemq/artemis/tests/util/JMSClusteredTestBase.java | 4 ----
 .../activemq/artemis/jms/tests/AutoAckMessageListenerTest.java   | 6 ------
 .../apache/activemq/artemis/jms/tests/CTSMiscellaneousTest.java  | 5 -----
 .../apache/activemq/artemis/jms/tests/ConnectionClosedTest.java  | 6 ------
 .../org/apache/activemq/artemis/jms/tests/ConnectionTest.java    | 6 ------
 .../apache/activemq/artemis/jms/tests/ConsumerClosedTest.java    | 7 +------
 .../activemq/artemis/jms/tests/DurableSubscriptionTest.java      | 6 ------
 .../activemq/artemis/jms/tests/MessageWithReadResolveTest.java   | 7 -------
 .../org/apache/activemq/artemis/jms/tests/MiscellaneousTest.java | 7 -------
 .../activemq/artemis/jms/tests/NonDurableSubscriberTest.java     | 6 ------
 .../org/apache/activemq/artemis/jms/tests/ReferenceableTest.java | 6 ------
 .../java/org/apache/activemq/artemis/jms/tests/SessionTest.java  | 6 ------
 .../activemq/artemis/jms/tests/TemporaryDestinationTest.java     | 6 ------
 .../java/org/apache/activemq/artemis/jms/tests/TopicTest.java    | 6 ------
 .../activemq/artemis/jms/tests/message/BytesMessageTest.java     | 6 ------
 .../artemis/jms/tests/message/JMSCorrelationIDHeaderTest.java    | 6 ------
 .../artemis/jms/tests/message/JMSDeliveryModeHeaderTest.java     | 7 -------
 .../artemis/jms/tests/message/JMSDestinationHeaderTest.java      | 6 ------
 .../artemis/jms/tests/message/JMSExpirationHeaderTest.java       | 5 -----
 .../artemis/jms/tests/message/JMSMessageIDHeaderTest.java        | 6 ------
 .../activemq/artemis/jms/tests/message/JMSReplyToHeaderTest.java | 6 ------
 .../artemis/jms/tests/message/JMSTimestampHeaderTest.java        | 6 ------
 .../activemq/artemis/jms/tests/message/JMSTypeHeaderTest.java    | 6 ------
 .../activemq/artemis/jms/tests/message/MapMessageTest.java       | 7 -------
 .../activemq/artemis/jms/tests/message/MessageHeaderTest.java    | 6 ------
 .../artemis/jms/tests/message/MessageHeaderTestBase.java         | 4 ----
 .../artemis/jms/tests/message/MessagePropertyConversionTest.java | 4 ++--
 .../activemq/artemis/jms/tests/message/MessageTestBase.java      | 6 ------
 .../artemis/jms/tests/message/ObjectMessageDeliveryTest.java     | 6 ------
 .../artemis/jms/tests/message/SimpleJMSBytesMessage.java         | 3 ---
 .../activemq/artemis/jms/tests/message/SimpleJMSMapMessage.java  | 5 -----
 .../activemq/artemis/jms/tests/message/SimpleJMSMessage.java     | 2 +-
 .../artemis/jms/tests/message/SimpleJMSObjectMessage.java        | 5 -----
 .../artemis/jms/tests/message/SimpleJMSStreamMessage.java        | 5 -----
 .../activemq/artemis/jms/tests/message/SimpleJMSTextMessage.java | 5 -----
 .../activemq/artemis/jms/tests/message/StreamMessageTest.java    | 7 -------
 .../activemq/artemis/jms/tests/message/TextMessageTest.java      | 7 -------
 .../activemq/artemis/jms/tests/tools/ServerManagement.java       | 3 +--
 .../activemq/artemis/jms/tests/tools/container/Constants.java    | 6 +-----
 .../activemq/artemis/jms/tests/tools/container/InVMContext.java  | 4 ----
 .../jms/tests/tools/container/InVMInitialContextFactory.java     | 6 ------
 .../tests/tools/container/InVMInitialContextFactoryBuilder.java  | 6 +-----
 .../artemis/jms/tests/tools/container/InVMNameParser.java        | 7 ++-----
 .../artemis/jms/tests/tools/container/LocalTestServer.java       | 5 +----
 .../org/apache/activemq/artemis/jms/tests/util/JNDIUtilTest.java | 5 -----
 .../org/apache/activemq/artemis/common/SpawnedJMSServer.java     | 2 +-
 .../activemq/artemis/tests/soak/client/ClientAbstract.java       | 6 +-----
 .../artemis/tests/soak/client/ClientNonDivertedSoakTest.java     | 6 ------
 .../activemq/artemis/tests/soak/client/ClientSoakTest.java       | 5 -----
 .../org/apache/activemq/artemis/tests/soak/client/Receiver.java  | 7 -------
 .../org/apache/activemq/artemis/tests/soak/client/Sender.java    | 7 -------
 .../artemis/tests/soak/client/SimpleSendReceiveSoakTest.java     | 6 ------
 .../artemis/tests/stress/chunk/LargeMessageStressTest.java       | 7 -------
 .../activemq/artemis/tests/stress/client/SendStressTest.java     | 7 -------
 .../artemis/tests/stress/failover/RandomReattachStressTest.java  | 7 -------
 .../stress/journal/AIOAllPossibilitiesCompactStressTest.java     | 7 -------
 .../artemis/tests/stress/journal/AddAndRemoveStressTest.java     | 6 +-----
 .../artemis/tests/stress/journal/CompactingStressTest.java       | 4 ----
 .../tests/stress/journal/JournalCleanupCompactStressTest.java    | 7 -------
 .../artemis/tests/stress/journal/JournalRestartStressTest.java   | 6 ------
 .../artemis/tests/stress/journal/LargeJournalStressTest.java     | 5 -----
 .../artemis/tests/stress/journal/MixupCompactorTestBase.java     | 6 ------
 .../tests/stress/journal/MultiThreadConsumerStressTest.java      | 6 ------
 .../tests/stress/journal/NIOMultiThreadCompactorStressTest.java  | 5 -----
 .../tests/stress/paging/MultipleConsumersPageStressTest.java     | 6 ------
 .../artemis/tests/stress/paging/PageCursorStressTest.java        | 2 --
 .../artemis/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java  | 5 -----
 .../org/apache/activemq/artemis/tests/timing/util/UUIDTest.java  | 5 -----
 .../tests/unit/core/client/impl/LargeMessageBufferTest.java      | 7 -------
 .../tests/unit/core/config/impl/ConfigurationValidationTest.java | 7 -------
 .../tests/unit/core/config/impl/TransportConfigurationTest.java  | 7 -------
 .../tests/unit/core/journal/impl/AlignedJournalImplTest.java     | 7 ++-----
 .../artemis/tests/unit/core/journal/impl/CleanBufferTest.java    | 7 -------
 .../artemis/tests/unit/core/journal/impl/JournalAsyncTest.java   | 6 ------
 .../artemis/tests/unit/core/journal/impl/TimedBufferTest.java    | 5 -----
 .../tests/unit/core/journal/impl/fakes/SimpleEncoding.java       | 6 ------
 .../artemis/tests/unit/core/paging/impl/PagePositionTest.java    | 7 -------
 .../activemq/artemis/tests/unit/core/paging/impl/PageTest.java   | 7 -------
 .../unit/core/postoffice/impl/DuplicateDetectionUnitTest.java    | 6 ------
 .../artemis/tests/unit/core/remoting/ActiveMQBufferTestBase.java | 7 -------
 .../unit/core/remoting/impl/netty/ChannelBufferWrapper2Test.java | 7 -------
 .../tests/unit/core/remoting/impl/ssl/SSLSupportTest.java        | 6 ------
 .../unit/core/server/group/impl/SystemPropertyOverrideTest.java  | 6 ------
 .../activemq/artemis/tests/unit/jms/ActiveMQDestinationTest.java | 6 ------
 .../artemis/tests/unit/jms/client/ActiveMQMapMessageTest.java    | 5 -----
 .../artemis/tests/unit/jms/client/ActiveMQStreamMessageTest.java | 6 ------
 .../artemis/tests/unit/jms/client/JMSExceptionHelperTest.java    | 6 ------
 .../activemq/artemis/tests/unit/jms/misc/ManifestTest.java       | 6 ------
 .../activemq/artemis/tests/unit/ra/ResourceAdapterTest.java      | 7 -------
 .../unit/ra/referenceable/DestinationObjectFactoryTest.java      | 6 ------
 .../org/apache/activemq/artemis/tests/unit/util/InVMContext.java | 6 +-----
 .../apache/activemq/artemis/tests/unit/util/InVMNameParser.java  | 5 +----
 .../activemq/artemis/tests/unit/util/InVMNamingContext.java      | 4 ----
 .../tests/unit/util/ObjectInputStreamWithClassLoaderTest.java    | 6 ------
 .../activemq/artemis/tests/unit/util/SoftValueMapTest.java       | 6 ------
 .../activemq/artemis/tests/unit/util/UUIDGeneratorTest.java      | 6 ------
 .../activemq/artemis/tests/unit/util/VersionLoaderTest.java      | 6 ------
 311 files changed, 74 insertions(+), 1564 deletions(-)

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 33b00eb..a468888 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
@@ -38,8 +38,6 @@ public final class SimpleString implements CharSequence, Serializable, Comparabl
    private static final SimpleString EMPTY = new SimpleString("");
    private static final long serialVersionUID = 4204223851422244307L;
 
-   // Attributes
-   // ------------------------------------------------------------------------
    private final byte[] data;
 
    private transient int hash;
@@ -49,8 +47,6 @@ public final class SimpleString implements CharSequence, Serializable, Comparabl
 
    private transient String[] paths;
 
-   // Static
-   // ----------------------------------------------------------------------
 
    /**
     * Returns a SimpleString constructed from the {@code string} parameter.
@@ -74,8 +70,6 @@ public final class SimpleString implements CharSequence, Serializable, Comparabl
       return pool.getOrCreate(string);
    }
 
-   // Constructors
-   // ----------------------------------------------------------------------
 
    /**
     * creates a SimpleString from a conventional String
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 766c1d6..afd88d1 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
@@ -24,7 +24,7 @@ import org.apache.activemq.artemis.api.core.ActiveMQBuffers;
 import org.apache.activemq.artemis.api.core.SimpleString;
 
 public class RandomUtil {
-   // Constants -----------------------------------------------------
+
 
    protected static final Random random = new Random();
 
@@ -32,9 +32,6 @@ public class RandomUtil {
       return random;
    }
 
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
 
    public static String randomString() {
       return java.util.UUID.randomUUID().toString();
@@ -131,7 +128,7 @@ public class RandomUtil {
       return RandomUtil.random.nextFloat();
    }
 
-   // Constructors --------------------------------------------------
+
 
    // Public --------------------------------------------------------
 
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 8e0c8c8..b7adddc 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
@@ -25,17 +25,12 @@ import org.junit.Before;
 import org.junit.Test;
 
 public class ConcurrentHashSetTest extends Assert {
-   // Constants -----------------------------------------------------
 
-   // Attributes ----------------------------------------------------
 
    private ConcurrentSet<String> set;
 
    private String element;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 a2917ff..fe8a297 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
@@ -25,9 +25,6 @@ import org.junit.Test;
 
 public class TypedPropertiesConversionTest {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
 
    private TypedProperties props;
 
@@ -35,10 +32,6 @@ public class TypedPropertiesConversionTest {
 
    private final SimpleString unknownKey = new SimpleString("this.key.is.never.used");
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
-
    // Public --------------------------------------------------------
 
    @Before
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 0786dad..112d589 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
@@ -56,7 +56,7 @@ public class TypedPropertiesTest {
       }
    }
 
-   // Constructors --------------------------------------------------
+
 
    // Public --------------------------------------------------------
 
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 5e488d9..24938e9 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
@@ -137,7 +137,6 @@ public final class AddressSettingsInfo {
 
    private final boolean enableMetrics;
 
-   // Static --------------------------------------------------------
 
    public static AddressSettingsInfo from(final String jsonString) {
       JsonObject object = JsonUtil.readJsonObject(jsonString);
@@ -200,7 +199,6 @@ public final class AddressSettingsInfo {
                                      object.getBoolean("enableMetrics"));
    }
 
-   // Constructors --------------------------------------------------
 
    public AddressSettingsInfo(String addressFullMessagePolicy,
                               long maxSizeBytes,
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 1dce276..73549e6 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
@@ -34,7 +34,6 @@ public final class DayCounterInfo {
 
    private final long[] counters;
 
-   // Static --------------------------------------------------------
 
    public static String toJSON(final DayCounterInfo[] infos) {
       JsonObjectBuilder json = JsonLoader.createObjectBuilder();
@@ -73,7 +72,6 @@ public final class DayCounterInfo {
       return infos;
    }
 
-   // Constructors --------------------------------------------------
 
    public DayCounterInfo(final String date, final long[] counters) {
       this.date = date;
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ManagementHelper.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ManagementHelper.java
index 53cb087..462a7b7 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ManagementHelper.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ManagementHelper.java
@@ -28,7 +28,6 @@ import org.apache.activemq.artemis.core.message.impl.CoreMessage;
  * Helper class to use ActiveMQ Artemis Core messages to manage server resources.
  */
 public final class ManagementHelper {
-   // Constants -----------------------------------------------------
 
    public static final SimpleString HDR_RESOURCE_NAME = new SimpleString("_AMQ_ResourceName");
 
@@ -88,9 +87,6 @@ public final class ManagementHelper {
 
    public static final SimpleString HDR_CLIENT_ID = new SimpleString("_AMQ_Client_ID");
 
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
 
    /**
     * Stores a resource attribute in a message to retrieve the value from the server resource.
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 aa2b0b3..e5f9bd8 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
@@ -66,7 +66,6 @@ public final class MessageCounterInfo {
       return new MessageCounterInfo(name, subscription, durable, count, countDelta, depth, depthDelta, lastAddTimestamp, lastAckTimestamp, updateTimestamp);
    }
 
-   // Constructors --------------------------------------------------
 
    public MessageCounterInfo(final String name,
                              final String subscription,
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 a97ff7c..259dee0 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
@@ -27,14 +27,12 @@ import org.apache.activemq.artemis.api.core.RoutingType;
  */
 public final class ObjectNameBuilder {
 
-   // Constants -----------------------------------------------------
 
    /**
     * Default JMX domain for ActiveMQ Artemis resources.
     */
    public static final ObjectNameBuilder DEFAULT = new ObjectNameBuilder(ActiveMQDefaultConfiguration.getDefaultJmxDomain(), "localhost", true);
 
-   // Attributes ----------------------------------------------------
 
    private final String domain;
 
@@ -42,7 +40,6 @@ public final class ObjectNameBuilder {
 
    private final boolean jmxUseBrokerName;
 
-   // Static --------------------------------------------------------
 
    public static ObjectNameBuilder create(final String domain) {
       if (domain == null) {
@@ -68,7 +65,7 @@ public final class ObjectNameBuilder {
       }
    }
 
-   // Constructors --------------------------------------------------
+
 
    private ObjectNameBuilder(final String domain, final String brokerName, boolean jmxUseBrokerName) {
       this.domain = domain;
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 83ee890..1127840 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
@@ -47,8 +47,7 @@ import org.apache.activemq.artemis.utils.collections.PriorityLinkedListImpl;
 import org.jboss.logging.Logger;
 
 public final class ClientConsumerImpl implements ClientConsumerInternal {
-   // Constants
-   // ------------------------------------------------------------------------------------
+
 
    private static final Logger logger = Logger.getLogger(ClientConsumerImpl.class);
 
@@ -58,9 +57,6 @@ public final class ClientConsumerImpl implements ClientConsumerInternal {
 
    public static final SimpleString FORCED_DELIVERY_MESSAGE = new SimpleString("_hornetq.forced.delivery.seq");
 
-   // Attributes
-   // -----------------------------------------------------------------------------------
-
    private final ClientSessionInternal session;
 
    private final SessionContext sessionContext;
@@ -135,8 +131,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal {
 
    private final ClassLoader contextClassLoader;
 
-   // Constructors
-   // ---------------------------------------------------------------------------------
+
 
    public ClientConsumerImpl(final ClientSessionInternal session,
                              final ConsumerContext consumerContext,
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 06cacd2..42e66dd 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
@@ -64,9 +64,6 @@ public class ClientProducerImpl implements ClientProducerInternal {
 
    private final ClientProducerCredits producerCredits;
 
-   // Static ---------------------------------------------------------------------------------------
-
-   // Constructors ---------------------------------------------------------------------------------
 
    public ClientProducerImpl(final ClientSessionInternal session,
                              final SimpleString address,
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 be2bb78..430e821 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
@@ -50,11 +50,9 @@ import org.apache.activemq.artemis.utils.UTF8Util;
  * saveStream are called.
  */
 public class LargeMessageControllerImpl implements LargeMessageController {
-   // Constants -----------------------------------------------------
 
    private static final String READ_ONLY_ERROR_MESSAGE = "This is a read-only buffer, setOperations are not supported";
 
-   // Attributes ----------------------------------------------------
 
    private final ClientConsumerInternal consumerInternal;
 
@@ -94,9 +92,6 @@ public class LargeMessageControllerImpl implements LargeMessageController {
    private final FileCache fileCache;
 
    private boolean local = false;
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    public LargeMessageControllerImpl(final ClientConsumerInternal consumerInternal,
                                      final long totalSize,
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 4384445..2fd5dd2 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
@@ -26,7 +26,7 @@ import org.apache.activemq.artemis.core.protocol.core.Packet;
 import org.apache.activemq.artemis.utils.DataConstants;
 
 public class PacketImpl implements Packet {
-   // Constants -------------------------------------------------------------------------
+
 
 
    // 2.0.0
@@ -287,7 +287,7 @@ public class PacketImpl implements Packet {
 
    public static final byte DISCONNECT_V3 = -19;
 
-   // Static --------------------------------------------------------
+
 
    public PacketImpl(final byte type) {
       this.type = type;
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/RemotingConnectionImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/RemotingConnectionImpl.java
index 5af3918..cec722c 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/RemotingConnectionImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/RemotingConnectionImpl.java
@@ -85,8 +85,6 @@ public class RemotingConnectionImpl extends AbstractRemotingConnection implement
       flush();
    }
 
-   // Constructors
-   // ---------------------------------------------------------------------------------
 
    /*
     * Create a client side connection
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 a389758..acf7dd6 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
@@ -25,9 +25,6 @@ public class ActiveMQExceptionMessage extends PacketImpl {
 
    protected ActiveMQException exception;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    public ActiveMQExceptionMessage(final ActiveMQException exception) {
       super(EXCEPTION);
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 e0ba6d7..1e0378d 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
@@ -24,9 +24,7 @@ public class ActiveMQExceptionMessage_V2 extends ActiveMQExceptionMessage {
 
    private long correlationID;
 
-   // Static --------------------------------------------------------
 
-   // Constructors --------------------------------------------------
 
    public ActiveMQExceptionMessage_V2(final long correlationID, final ActiveMQException exception) {
       super(exception);
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 35aca2c..30b29bd 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
@@ -31,9 +31,6 @@ public class ClusterTopologyChangeMessage extends PacketImpl {
 
    protected boolean last;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    public ClusterTopologyChangeMessage(final String nodeID,
                                        final Pair<TransportConfiguration, TransportConfiguration> pair,
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 f09a2de..3b6a4a4 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
@@ -21,15 +21,10 @@ import org.apache.activemq.artemis.api.core.SimpleString;
 import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl;
 
 public class DisconnectMessage extends PacketImpl {
-   // Constants -----------------------------------------------------
 
-   // Attributes ----------------------------------------------------
 
    protected SimpleString nodeID;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    public DisconnectMessage(final SimpleString nodeID) {
       super(DISCONNECT);
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 91064d4..058c954 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
@@ -20,17 +20,12 @@ import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
 import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl;
 
 public class SessionExpireMessage extends PacketImpl {
-   // Constants -----------------------------------------------------
 
-   // Attributes ----------------------------------------------------
 
    private long consumerID;
 
    private long messageID;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    public SessionExpireMessage(final long consumerID, final long messageID) {
       super(SESS_EXPIRED);
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 72f56b6..f99ef4b 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
@@ -20,9 +20,7 @@ import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
 import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl;
 
 public class SessionIndividualAcknowledgeMessage extends PacketImpl {
-   // Constants -----------------------------------------------------
 
-   // Attributes ----------------------------------------------------
 
    private long consumerID;
 
@@ -30,9 +28,6 @@ public class SessionIndividualAcknowledgeMessage extends PacketImpl {
 
    private boolean requiresResponse;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    public SessionIndividualAcknowledgeMessage(final long consumerID,
                                               final long messageID,
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 bbb1261..898d36a 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
@@ -21,17 +21,12 @@ import org.apache.activemq.artemis.utils.DataConstants;
 
 public class SessionReceiveContinuationMessage extends SessionContinuationMessage {
 
-   // Constants -----------------------------------------------------
 
    public static final int SESSION_RECEIVE_CONTINUATION_BASE_SIZE = SESSION_CONTINUATION_BASE_SIZE + DataConstants.SIZE_LONG;
 
-   // Attributes ----------------------------------------------------
 
    private long consumerID;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    public SessionReceiveContinuationMessage() {
       super(SESS_RECEIVE_CONTINUATION);
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 32e41e4..f138326 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
@@ -23,9 +23,6 @@ import org.apache.activemq.artemis.core.message.impl.CoreMessage;
 import org.apache.activemq.artemis.utils.DataConstants;
 
 public class SessionReceiveMessage extends MessagePacket {
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
 
    protected long consumerID;
 
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 40f9721..34c6fbb 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
@@ -45,9 +45,7 @@ public class SessionSendContinuationMessage extends SessionContinuationMessage {
     */
    protected long messageBodySize = -1;
 
-   // Static --------------------------------------------------------
 
-   // Constructors --------------------------------------------------
 
    public SessionSendContinuationMessage() {
       super(SESS_SEND_CONTINUATION);
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 3e7629a..4d588cd 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
@@ -28,9 +28,7 @@ public class SessionSendContinuationMessage_V2 extends SessionSendContinuationMe
 
    private long correlationID;
 
-   // Static --------------------------------------------------------
 
-   // Constructors --------------------------------------------------
 
    public SessionSendContinuationMessage_V2() {
       super();
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 73b07d3..f45aebc 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
@@ -28,9 +28,6 @@ public class SessionSendLargeMessage extends PacketImpl implements MessagePacket
     */
    private Message largeMessage;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    public SessionSendLargeMessage(final Message largeMessage) {
       super(SESS_SEND_LARGE);
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 e367a8a..b0f2b34 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
@@ -18,13 +18,6 @@ package org.apache.activemq.artemis.core.protocol.core.impl.wireformat;
 
 public class SessionUniqueAddMetaDataMessage extends SessionAddMetaDataMessageV2 {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    public SessionUniqueAddMetaDataMessage() {
       super(SESS_UNIQUE_ADD_METADATA);
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 c74ddae..e90f570 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
@@ -26,15 +26,10 @@ import org.apache.activemq.artemis.utils.XidCodecSupport;
  * to be called after a failure on an XA Session
  */
 public class SessionXAAfterFailedMessage extends PacketImpl {
-   // Constants -----------------------------------------------------
 
-   // Attributes ----------------------------------------------------
 
    private Xid xid;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    public SessionXAAfterFailedMessage(final Xid xid) {
       super(SESS_XA_FAILED);
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 16926c4..92c1abc 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
@@ -23,15 +23,10 @@ import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl;
 import org.apache.activemq.artemis.utils.XidCodecSupport;
 
 public class SessionXAStartMessage extends PacketImpl {
-   // Constants -----------------------------------------------------
 
-   // Attributes ----------------------------------------------------
 
    private Xid xid;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    public SessionXAStartMessage(final Xid xid) {
       super(SESS_XA_START);
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 814a920..d2a0595 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
@@ -134,7 +134,6 @@ public class NettyConnector extends AbstractConnector {
 
    private static final Logger logger = Logger.getLogger(NettyConnector.class);
 
-   // Constants -----------------------------------------------------
    public static final String JAVAX_KEYSTORE_PATH_PROP_NAME = "javax.net.ssl.keyStore";
    public static final String JAVAX_KEYSTORE_PASSWORD_PROP_NAME = "javax.net.ssl.keyStorePassword";
    public static final String JAVAX_KEYSTORE_TYPE_PROP_NAME = "javax.net.ssl.keyStoreType";
@@ -176,7 +175,6 @@ public class NettyConnector extends AbstractConnector {
       DEFAULT_CONFIG = Collections.unmodifiableMap(config);
    }
 
-   // Attributes ----------------------------------------------------
 
    private final boolean serverConnection;
 
@@ -303,10 +301,6 @@ public class NettyConnector extends AbstractConnector {
 
    private final ClientProtocolManager protocolManager;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
-
    // Public --------------------------------------------------------
    public NettyConnector(final Map<String, Object> configuration,
                          final BufferHandler handler,
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 a191cbd..ff9416d 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
@@ -39,7 +39,6 @@ public class XidImpl implements Xid, Serializable {
 
    private boolean hashCalculated;
 
-   // Static --------------------------------------------------------
 
    public static String toBase64String(final Xid xid) {
       byte[] data = XidImpl.toByteArray(xid);
@@ -62,7 +61,7 @@ public class XidImpl implements Xid, Serializable {
       return hashBytes;
    }
 
-   // Constructors --------------------------------------------------
+
 
    /**
     * Standard constructor
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/version/impl/VersionImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/version/impl/VersionImpl.java
index 4ec3ed1..757c14e 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/version/impl/VersionImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/version/impl/VersionImpl.java
@@ -37,7 +37,7 @@ public class VersionImpl implements Version, Serializable {
 
    private final int[] compatibleVersionList;
 
-   // Constructors --------------------------------------------------
+
 
    public VersionImpl(final String versionName,
                       final int majorVersion,
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 25c7585..9176dc3 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
@@ -29,14 +29,9 @@ public class ActiveMQBufferInputStream extends InputStream {
    /* (non-Javadoc)
     * @see java.io.InputStream#read()
     */
-   // Constants -----------------------------------------------------
 
-   // Attributes ----------------------------------------------------
    private ActiveMQBuffer bb;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 83a1510..988c87b 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
@@ -24,9 +24,6 @@ import javax.naming.NamingException;
 import java.util.StringTokenizer;
 
 public class JNDIUtil {
-   // Constants -----------------------------------------------------
-
-   // Static --------------------------------------------------------
 
    /**
     * Create a context path recursively.
@@ -89,9 +86,6 @@ public class JNDIUtil {
       }
    }
 
-   // Attributes ----------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 31d7a47..40e7f57 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
@@ -30,7 +30,6 @@ import java.util.List;
 
 public class ObjectInputStreamWithClassLoader extends ObjectInputStream {
 
-   // Constants ------------------------------------------------------------------------------------
 
    /**
     * Value used to indicate that all classes should be white or black listed,
@@ -40,14 +39,10 @@ public class ObjectInputStreamWithClassLoader extends ObjectInputStream {
    public static final String WHITELIST_PROPERTY = "org.apache.activemq.artemis.jms.deserialization.whitelist";
    public static final String BLACKLIST_PROPERTY = "org.apache.activemq.artemis.jms.deserialization.blacklist";
 
-   // Attributes -----------------------------------------------------------------------------------
 
    private List<String> whiteList = new ArrayList<>();
    private List<String> blackList = new ArrayList<>();
 
-   // Static ---------------------------------------------------------------------------------------
-
-   // Constructors ---------------------------------------------------------------------------------
 
    public ObjectInputStreamWithClassLoader(final InputStream in) throws IOException {
       super(in);
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 0214374..5314cd8 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
@@ -18,7 +18,6 @@ package org.apache.activemq.artemis.utils;
 
 public class SizeFormatterUtil {
 
-   // Constants -----------------------------------------------------
 
    private static long oneKiB = 1024;
 
@@ -26,10 +25,6 @@ public class SizeFormatterUtil {
 
    private static long oneGiB = SizeFormatterUtil.oneMiB * 1024;
 
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
    public static String sizeof(final long size) {
       double s = Long.valueOf(size).doubleValue();
       String suffix = "B";
@@ -45,7 +40,6 @@ public class SizeFormatterUtil {
       }
       return String.format("%.2f %s", s, suffix);
    }
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 45be1a2..bfca0cd 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
@@ -44,18 +44,14 @@ public class SoftValueLongObjectHashMap<V extends SoftValueLongObjectHashMap.Val
 
    private int maxElements;
 
-   // Constants -----------------------------------------------------
 
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
 
    public interface ValueCache {
 
       boolean isLive();
    }
 
-   // Constructors --------------------------------------------------
+
 
    public SoftValueLongObjectHashMap(final int maxElements) {
       this.maxElements = maxElements;
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 806f1f4..cb56cfb 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
@@ -25,7 +25,7 @@ import java.util.concurrent.atomic.AtomicLong;
  * </p>
  */
 public class TimeAndCounterIDGenerator implements IDGenerator {
-   // Constants ----------------------------------------------------
+
 
    /**
     * Bits to move the date accordingly to MASK_TIME
@@ -40,7 +40,6 @@ public class TimeAndCounterIDGenerator implements IDGenerator {
 
    private static final long TIME_ID_MASK = 0x7fffffffff000000L;
 
-   // Attributes ----------------------------------------------------
 
    private final AtomicLong counter = new AtomicLong(0);
 
@@ -48,9 +47,6 @@ public class TimeAndCounterIDGenerator implements IDGenerator {
 
    private volatile long tmMark;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    public TimeAndCounterIDGenerator() {
       refresh();
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 32e5194..e7d601f 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
@@ -23,11 +23,6 @@ import org.apache.activemq.artemis.core.transaction.impl.XidImpl;
 
 public class XidCodecSupport {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
 
    public static void encodeXid(final Xid xid, final ActiveMQBuffer out) {
       out.writeInt(xid.getFormatId());
@@ -50,7 +45,6 @@ public class XidCodecSupport {
       return DataConstants.SIZE_INT * 3 + xid.getBranchQualifier().length + xid.getGlobalTransactionId().length;
    }
 
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 cd55e92..b7b4db2 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,14 +26,6 @@ import org.junit.Test;
 
 public class TimeAndCounterIDGeneratorTest extends Assert {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
-
    // Public --------------------------------------------------------
 
    @Test
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 9d8bbfc..95756d2 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
@@ -25,7 +25,7 @@ import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
 public class XMLUtilTest extends SilentTestCase {
-   // Constructors --------------------------------------------------
+
 
    // Public --------------------------------------------------------
 
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 6da3912..4fff128 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
@@ -58,14 +58,11 @@ import static org.apache.activemq.artemis.reader.BytesMessageUtil.bytesWriteUTF;
  */
 public class ActiveMQBytesMessage extends ActiveMQMessage implements BytesMessage {
 
-   // Static -------------------------------------------------------
    public static final byte TYPE = Message.BYTES_TYPE;
 
-   // Attributes ----------------------------------------------------
 
    private int bodyLength;
 
-   // Constructor ---------------------------------------------------
 
    /**
     * This constructor is used to construct messages prior to sending
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 61f5f3f..7cb526a 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
@@ -66,7 +66,7 @@ import org.apache.activemq.artemis.utils.collections.ConcurrentHashSet;
  */
 public class ActiveMQConnection extends ActiveMQConnectionForContextImpl implements TopicConnection, QueueConnection {
 
-   // Constants ------------------------------------------------------------------------------------
+
    public static final int TYPE_GENERIC_CONNECTION = 0;
 
    public static final int TYPE_QUEUE_CONNECTION = 1;
@@ -79,9 +79,6 @@ public class ActiveMQConnection extends ActiveMQConnectionForContextImpl impleme
 
    public static final SimpleString CONNECTION_ID_PROPERTY_NAME = MessageUtil.CONNECTION_ID_PROPERTY_NAME;
 
-   // Static ---------------------------------------------------------------------------------------
-
-   // Attributes -----------------------------------------------------------------------------------
 
    private final int connectionType;
 
@@ -137,7 +134,6 @@ public class ActiveMQConnection extends ActiveMQConnectionForContextImpl impleme
 
    private final ConnectionFactoryOptions options;
 
-   // Constructors ---------------------------------------------------------------------------------
 
    public ActiveMQConnection(final ConnectionFactoryOptions options,
                              final String username,
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionMetaData.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionMetaData.java
index 4d69b71..43bcc83 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionMetaData.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionMetaData.java
@@ -49,17 +49,13 @@ public class ActiveMQConnectionMetaData implements ConnectionMetaData {
       JMS_MINOR_VERSION = Integer.valueOf(versionProps.getProperty("activemq.version.implementation.minorVersion", "0"));
    }
 
-   // Constants -----------------------------------------------------
 
    private static final String ACTIVEMQ = "ActiveMQ";
 
-   // Static --------------------------------------------------------
-
-   // Attributes ----------------------------------------------------
 
    private final Version serverVersion;
 
-   // Constructors --------------------------------------------------
+
 
    /**
     * Create a new ActiveMQConnectionMetaData object.
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 469db14..2603e7b 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
@@ -37,9 +37,7 @@ import org.apache.activemq.artemis.utils.DestinationUtil;
  * ActiveMQ Artemis implementation of a JMS Destination.
  */
 public class ActiveMQDestination extends JNDIStorable implements Destination, Serializable {
-   // Constants -----------------------------------------------------
 
-   // Static --------------------------------------------------------
 
    private static final long serialVersionUID = 5027962425462382883L;
 
@@ -292,7 +290,6 @@ public class ActiveMQDestination extends JNDIStorable implements Destination, Se
       return createTemporaryTopic(address, null);
    }
 
-   // Attributes ----------------------------------------------------
 
    /**
     * The core address
@@ -318,7 +315,7 @@ public class ActiveMQDestination extends JNDIStorable implements Destination, Se
    private final transient ActiveMQSession session;
 
    private transient boolean created;
-   // Constructors --------------------------------------------------
+
 
    protected ActiveMQDestination(final String address,
                                  final TYPE type,
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 e0249bf..38f572e 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
@@ -37,19 +37,14 @@ import static org.apache.activemq.artemis.reader.MapMessageUtil.writeBodyMap;
  * ActiveMQ Artemis implementation of a JMS MapMessage.
  */
 public class ActiveMQMapMessage extends ActiveMQMessage implements MapMessage {
-   // Constants -----------------------------------------------------
 
    public static final byte TYPE = Message.MAP_TYPE;
 
-   // Attributes ----------------------------------------------------
 
    private final TypedProperties map = new TypedProperties();
 
    private boolean invalid;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    /*
     * This constructor is used to construct messages prior to sending
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 7cc6c47..c7bcf78 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
@@ -63,7 +63,6 @@ import static org.apache.activemq.artemis.jms.client.ActiveMQDestination.TOPIC_Q
  */
 public class ActiveMQMessage implements javax.jms.Message {
 
-   // Constants -----------------------------------------------------
    public static final byte TYPE = org.apache.activemq.artemis.api.core.Message.DEFAULT_TYPE;
 
    public static final SimpleString OLD_QUEUE_QUALIFIED_PREFIX = SimpleString.toSimpleString(ActiveMQDestination.QUEUE_QUALIFIED_PREFIX + PacketImpl.OLD_QUEUE_PREFIX);
@@ -110,7 +109,6 @@ public class ActiveMQMessage implements javax.jms.Message {
       return jmsdata;
    }
 
-   // Static --------------------------------------------------------
 
    private static final HashSet<String> reservedIdentifiers = new HashSet<>();
 
@@ -172,7 +170,6 @@ public class ActiveMQMessage implements javax.jms.Message {
       return msg;
    }
 
-   // Attributes ----------------------------------------------------
 
    // The underlying message
    protected ClientMessage message;
@@ -206,7 +203,6 @@ public class ActiveMQMessage implements javax.jms.Message {
 
    private long jmsDeliveryTime;
 
-   // Constructors --------------------------------------------------
 
    /*
     * Create a new message prior to sending
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 86c808c..1f489b6 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
@@ -66,7 +66,7 @@ public final class ActiveMQMessageConsumer implements QueueReceiver, TopicSubscr
 
    private final SimpleString autoDeleteQueueName;
 
-   // Constructors --------------------------------------------------
+
 
    protected ActiveMQMessageConsumer(final ConnectionFactoryOptions options,
                                      final ActiveMQConnection connection,
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 0c77132..f058394 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
@@ -72,7 +72,6 @@ public class ActiveMQMessageProducer implements MessageProducer, QueueSender, To
    private long defaultDeliveryDelay = Message.DEFAULT_DELIVERY_DELAY;
 
    private final ActiveMQDestination defaultDestination;
-   // Constructors --------------------------------------------------
 
    protected ActiveMQMessageProducer(final ActiveMQConnection connection,
                                      final ClientProducer producer,
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 173f29d..4d556a1 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
@@ -38,20 +38,16 @@ import org.apache.activemq.artemis.utils.ObjectInputStreamWithClassLoader;
  * Serialization is slooooow!
  */
 public class ActiveMQObjectMessage extends ActiveMQMessage implements ObjectMessage {
-   // Constants -----------------------------------------------------
+
 
    public static final byte TYPE = Message.OBJECT_TYPE;
 
-   // Attributes ----------------------------------------------------
 
    // keep a snapshot of the Serializable Object as a byte[] to provide Object isolation
    private byte[] data;
 
    private final ConnectionFactoryOptions options;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    protected ActiveMQObjectMessage(final ClientSession session, ConnectionFactoryOptions options) {
       super(ActiveMQObjectMessage.TYPE, session);
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 f1b69d7..44f3e76 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
@@ -27,14 +27,9 @@ import org.apache.activemq.artemis.api.core.SimpleString;
  */
 public class ActiveMQQueue extends ActiveMQDestination implements Queue {
 
-   // Constants -----------------------------------------------------
    private static final long serialVersionUID = -1106092883162295462L;
 
-   // Static --------------------------------------------------------
 
-   // Attributes ----------------------------------------------------
-
-   // Constructors --------------------------------------------------
    public ActiveMQQueue() {
       this((SimpleString) null);
    }
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 810166c..8135494 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
@@ -34,11 +34,7 @@ import org.apache.activemq.artemis.utils.SelectorTranslator;
  * ActiveMQ Artemis implementation of a JMS QueueBrowser.
  */
 public final class ActiveMQQueueBrowser implements QueueBrowser {
-   // Constants ------------------------------------------------------------------------------------
 
-   // Static ---------------------------------------------------------------------------------------
-
-   // Attributes -----------------------------------------------------------------------------------
 
    private final ConnectionFactoryOptions options;
 
@@ -52,7 +48,7 @@ public final class ActiveMQQueueBrowser implements QueueBrowser {
 
    private final boolean enable1xPrefixes;
 
-   // Constructors ---------------------------------------------------------------------------------
+
 
    protected ActiveMQQueueBrowser(final ConnectionFactoryOptions options,
                                   final ActiveMQQueue queue,
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 1b2d619..2b33c19 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
@@ -120,7 +120,6 @@ public class ActiveMQSession implements QueueSession, TopicSession {
 
    private final Map<String, Queue> queueCache = new ConcurrentHashMap<>();
 
-   // Constructors --------------------------------------------------
 
    protected ActiveMQSession(final ConnectionFactoryOptions options,
                              final ActiveMQConnection connection,
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 b79c36a..26d05eb 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
@@ -24,15 +24,10 @@ import javax.jms.TemporaryQueue;
  * This class can be instantiated directly.
  */
 public class ActiveMQTemporaryQueue extends ActiveMQQueue implements TemporaryQueue {
-   // Constants -----------------------------------------------------
 
-   private static final long serialVersionUID = -4624930377557954624L;
-
-   // Static --------------------------------------------------------
 
-   // Attributes ----------------------------------------------------
+   private static final long serialVersionUID = -4624930377557954624L;
 
-   // Constructors --------------------------------------------------
 
    // TemporaryQueue implementation ------------------------------------------
 
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 457663d..437a9e5 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
@@ -20,15 +20,10 @@ import javax.jms.TemporaryTopic;
 
 public class ActiveMQTemporaryTopic extends ActiveMQTopic implements TemporaryTopic {
 
-   // Constants -----------------------------------------------------
 
    private static final long serialVersionUID = 845450764835635266L;
 
-   // Attributes ----------------------------------------------------
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
    public ActiveMQTemporaryTopic() {
       this(null, null);
    }
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 1406b4c..7b3f930 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
@@ -34,19 +34,14 @@ import static org.apache.activemq.artemis.reader.TextMessageUtil.writeBodyText;
  * This class was ported from SpyTextMessage in JBossMQ.
  */
 public class ActiveMQTextMessage extends ActiveMQMessage implements TextMessage {
-   // Constants -----------------------------------------------------
 
    public static final byte TYPE = Message.TEXT_TYPE;
 
-   // Attributes ----------------------------------------------------
 
    // We cache it locally - it's more performant to cache as a SimpleString, the AbstractChannelBuffer write
    // methods are more efficient for a SimpleString
    private SimpleString text;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    public ActiveMQTextMessage(final ClientSession session) {
       super(ActiveMQTextMessage.TYPE, session);
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 0a2711c..2ca0fe4 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
@@ -26,14 +26,10 @@ import org.apache.activemq.artemis.api.core.SimpleString;
  * This class can be instantiated directly.
  */
 public class ActiveMQTopic extends ActiveMQDestination implements Topic {
-   // Constants -----------------------------------------------------
 
-   private static final long serialVersionUID = 7873614001276404156L;
-   // Static --------------------------------------------------------
 
-   // Attributes ----------------------------------------------------
+   private static final long serialVersionUID = 7873614001276404156L;
 
-   // Constructors --------------------------------------------------
    public ActiveMQTopic() {
       this((SimpleString) null);
    }
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 33e0799..a2a7e72 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
@@ -26,7 +26,6 @@ public class JMSBridgeControlImpl extends StandardMBean implements JMSBridgeCont
 
    private final JMSBridge bridge;
 
-   // Constructors --------------------------------------------------
 
    public JMSBridgeControlImpl(final JMSBridge bridge) throws Exception {
       super(JMSBridgeControl.class);
@@ -207,11 +206,6 @@ public class JMSBridgeControlImpl extends StandardMBean implements JMSBridgeCont
       bridge.setTargetUsername(name);
    }
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
 
    // Package protected ---------------------------------------------
 
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 53d0fb7..3e92e54 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
@@ -26,9 +26,6 @@ import org.apache.activemq.artemis.utils.DataConstants;
 
 public class PersistedBindings implements EncodingSupport {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
 
    private long id;
 
@@ -38,9 +35,6 @@ public class PersistedBindings implements EncodingSupport {
 
    private ArrayList<String> bindings = new ArrayList<>();
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    public PersistedBindings() {
    }
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 3e7e100..5a50bee 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
@@ -23,9 +23,6 @@ import org.apache.activemq.artemis.jms.server.config.impl.ConnectionFactoryConfi
 
 public class PersistedConnectionFactory implements EncodingSupport {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
 
    private long id;
 
@@ -43,9 +40,6 @@ public class PersistedConnectionFactory implements EncodingSupport {
       this.config = config;
    }
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 602f982..994d386 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
@@ -24,9 +24,6 @@ import org.apache.activemq.artemis.utils.DataConstants;
 
 public class PersistedDestination implements EncodingSupport {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
 
    private long id;
 
@@ -37,9 +34,6 @@ public class PersistedDestination implements EncodingSupport {
    private String selector;
 
    private boolean durable;
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    public PersistedDestination() {
    }
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 bc288db..d34f0b9 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
@@ -46,7 +46,7 @@ import org.apache.activemq.artemis.utils.IDGenerator;
 
 public final class JMSJournalStorageManagerImpl implements JMSStorageManager {
 
-   // Constants -----------------------------------------------------
+
 
    public static final byte CF_RECORD = 1;
 
@@ -54,7 +54,6 @@ public final class JMSJournalStorageManagerImpl implements JMSStorageManager {
 
    public static final byte BINDING_RECORD = 3;
 
-   // Attributes ----------------------------------------------------
 
    private final IDGenerator idGenerator;
 
@@ -72,9 +71,7 @@ public final class JMSJournalStorageManagerImpl implements JMSStorageManager {
 
    private final Configuration config;
 
-   // Static --------------------------------------------------------
 
-   // Constructors --------------------------------------------------
    public JMSJournalStorageManagerImpl(ExecutorFactory ioExecutors,
                                        final IDGenerator idGenerator,
                                        final Configuration config,
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 e082f9f..d5292c4 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
@@ -37,9 +37,7 @@ import org.apache.activemq.artemis.utils.DataConstants;
  * Every property on this class has to be also set through encoders through EncodingSupport implementation at this class.
  */
 public class ConnectionFactoryConfigurationImpl implements ConnectionFactoryConfiguration {
-   // Constants -----------------------------------------------------
 
-   // Attributes ----------------------------------------------------
 
    private String name = null;
 
@@ -130,10 +128,6 @@ public class ConnectionFactoryConfigurationImpl implements ConnectionFactoryConf
    private boolean useTopologyForLoadBalancing = ActiveMQClient.DEFAULT_USE_TOPOLOGY_FOR_LOADBALANCING;
 
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
-
    public ConnectionFactoryConfigurationImpl() {
    }
 
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 fbf77d4..27bf83f 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
@@ -20,9 +20,6 @@ import org.apache.activemq.artemis.jms.server.config.JMSQueueConfiguration;
 
 public class JMSQueueConfigurationImpl implements JMSQueueConfiguration {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
 
    private String name = null;
 
@@ -32,9 +29,6 @@ public class JMSQueueConfigurationImpl implements JMSQueueConfiguration {
 
    private String[] bindings = null;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    public JMSQueueConfigurationImpl() {
    }
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 1617db2..1b02ce3 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
@@ -20,17 +20,10 @@ import org.apache.activemq.artemis.jms.server.config.TopicConfiguration;
 
 public class TopicConfigurationImpl implements TopicConfiguration {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
    private String name;
 
    private String[] bindings;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    public TopicConfigurationImpl() {
    }
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 8fe0739..9155f00 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
@@ -111,13 +111,6 @@ public class TransportConfigurationEncodingSupport {
       return size;
    }
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 bec7091..856a7c9 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
@@ -51,12 +51,12 @@ public final class TimedBuffer extends CriticalComponentImpl {
 
    private static final double MAX_TIMEOUT_ERROR_FACTOR = 1.5;
 
-   // Constants -----------------------------------------------------
+
 
    // The number of tries on sleep before switching to spin
    private static final int MAX_CHECKS_ON_SLEEP = 20;
 
-   // Attributes ----------------------------------------------------
+
    // If the TimedBuffer is idle - i.e. no records are being added, then it's pointless the timer flush thread
    // in spinning and checking the time - and using up CPU in the process - this semaphore is used to
    // prevent that
@@ -88,9 +88,6 @@ public final class TimedBuffer extends CriticalComponentImpl {
    // no need to be volatile as every access is synchronized
    private boolean spinning = false;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 c80768e..96b385b 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
@@ -38,9 +38,6 @@ import org.apache.activemq.artemis.utils.collections.ConcurrentLongHashSet;
  */
 public abstract class AbstractJournalUpdateTask implements JournalReaderCallback {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
    public static final String FILE_COMPACT_CONTROL = "journal-rename-control.ctr";
 
    protected final JournalImpl journal;
@@ -63,9 +60,6 @@ public abstract class AbstractJournalUpdateTask implements JournalReaderCallback
 
    protected final List<JournalFile> newDataFiles = new ArrayList<>();
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    protected AbstractJournalUpdateTask(final SequentialFileFactory fileFactory,
                                        final JournalImpl journal,
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 6b48292..c025c49 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
@@ -202,7 +202,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
 
    protected static final byte FILL_CHARACTER = (byte) 'J';
 
-   // Attributes ----------------------------------------------------
+
 
    private volatile boolean autoReclaim = true;
 
@@ -355,7 +355,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
    public JournalFilesRepository getFilesRepository() {
       return filesRepository;
    }
-   // Constructors --------------------------------------------------
+
 
    public JournalImpl(final int fileSize,
                       final int minFiles,
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 d34c030..b5123d8 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
@@ -23,13 +23,6 @@ import org.apache.activemq.artemis.core.journal.IOCompletion;
  */
 public abstract class SyncIOCompletion implements IOCompletion {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/coreWrapper/CoreTextMessageWrapper.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/coreWrapper/CoreTextMessageWrapper.java
index f327b68..dd9c42c 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/coreWrapper/CoreTextMessageWrapper.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/coreWrapper/CoreTextMessageWrapper.java
@@ -43,15 +43,12 @@ public class CoreTextMessageWrapper extends CoreMessageWrapper {
 
    public static final byte TYPE = Message.TEXT_TYPE;
 
-   // Attributes ----------------------------------------------------
+
 
    // We cache it locally - it's more performant to cache as a SimpleString, the AbstractChannelBuffer write
    // methods are more efficient for a SimpleString
    private SimpleString text;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    /*
     * This constructor is used to construct messages prior to sending
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 e0bfecd..3549265 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
@@ -71,9 +71,7 @@ public class StompProtocolManager extends AbstractProtocolManager<StompFrame, St
    private final List<StompFrameInterceptor> incomingInterceptors;
    private final List<StompFrameInterceptor> outgoingInterceptors;
 
-   // Static --------------------------------------------------------
 
-   // Constructors --------------------------------------------------
 
    StompProtocolManager(final StompProtocolManagerFactory factory,
                         final ActiveMQServer server,
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 8829e40..636dde4 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
@@ -31,12 +31,8 @@ import org.apache.activemq.artemis.reader.MessageUtil;
 
 public class StompUtils {
 
-   // Constants -----------------------------------------------------
    private static final String DEFAULT_MESSAGE_PRIORITY = "4";
 
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
 
    public static void copyStandardHeadersFromFrameToMessage(StompFrame frame, Message msg, String prefix) throws Exception {
       Map<String, String> headers = new HashMap<>(frame.getHeadersMap());
@@ -153,7 +149,6 @@ public class StompUtils {
          command.addHeader(name.toString(), message.getObjectProperty(name).toString());
       }
    }
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 8efe50e..512f0a7 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
@@ -26,16 +26,12 @@ import java.util.Set;
  * https://jira.jboss.org/browse/HORNETQ-339
  */
 public class ActiveMQRAService {
-   // Constants -----------------------------------------------------
-   // Attributes ----------------------------------------------------
 
    private final MBeanServer mBeanServer;
 
    private final String resourceAdapterObjectName;
 
-   // Static --------------------------------------------------------
 
-   // Constructors --------------------------------------------------
 
    public ActiveMQRAService(final MBeanServer mBeanServer, final String resourceAdapterObjectName) {
       this.mBeanServer = mBeanServer;
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 6aa7785..9bd6be8 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
@@ -93,7 +93,6 @@ import org.apache.activemq.artemis.utils.uri.BeanSupport;
 import org.jboss.logging.Logger;
 
 public class ConfigurationImpl implements Configuration, Serializable {
-   // Constants ------------------------------------------------------------------------------
 
    private static final Logger logger = Logger.getLogger(ConfigurationImpl.class);
 
@@ -107,8 +106,6 @@ public class ConfigurationImpl implements Configuration, Serializable {
 
    private static final long serialVersionUID = 4077088945050267843L;
 
-   // Attributes -----------------------------------------------------------------------------
-
    private String name = "localhost";
 
    private boolean persistenceEnabled = ActiveMQDefaultConfiguration.isDefaultPersistenceEnabled();
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java
index d2e1d75..1e92a83 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java
@@ -321,7 +321,6 @@ public final class FileConfigurationParser extends XMLConfigurationUtil {
 
    private static final String ENABLE_INGRESS_TIMESTAMP = "enable-ingress-timestamp";
 
-   // Attributes ----------------------------------------------------
 
    private boolean validateAIO = false;
 
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 2a8aa8c..82c297b 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
@@ -54,13 +54,11 @@ import static org.apache.activemq.artemis.api.core.FilterConstants.NATIVE_MESSAG
  */
 public class FilterImpl implements Filter {
 
-   // Constants -----------------------------------------------------
 
    private final SimpleString sfilterString;
 
    private final BooleanExpression booleanExpression;
 
-   // Static ---------------------------------------------------------
 
    /**
     * @return null if <code>filterStr</code> is null or an empty String and a valid filter else
@@ -92,8 +90,6 @@ public class FilterImpl implements Filter {
       return new FilterImpl(filterStr, booleanExpression);
    }
 
-   // Constructors ---------------------------------------------------
-
    private FilterImpl(final SimpleString str, final BooleanExpression expression) {
       sfilterString = str;
       this.booleanExpression = expression;
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 cfcf2c2..e0cdc90 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
@@ -41,15 +41,9 @@ import org.apache.activemq.artemis.utils.UUIDGenerator;
 
 public abstract class AbstractControl extends StandardMBean {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
 
    protected final StorageManager storageManager;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    public AbstractControl(final Class<?> clazz, final StorageManager storageManager) throws NotCompliantMBeanException {
       super(clazz);
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 b319a1e..f4a9618 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
@@ -29,17 +29,11 @@ import org.apache.activemq.artemis.spi.core.remoting.Acceptor;
 
 public class AcceptorControlImpl extends AbstractControl implements AcceptorControl {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
 
    private final Acceptor acceptor;
 
    private final TransportConfiguration configuration;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    public AcceptorControlImpl(final Acceptor acceptor,
                               final StorageManager storageManager,
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 af17daf..d178b00 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
@@ -139,10 +139,9 @@ import org.apache.activemq.artemis.utils.collections.TypedProperties;
 import org.jboss.logging.Logger;
 
 public class ActiveMQServerControlImpl extends AbstractControl implements ActiveMQServerControl, NotificationEmitter, org.apache.activemq.artemis.core.server.management.NotificationListener {
-   // Constants -----------------------------------------------------
+
    private static final Logger logger = Logger.getLogger(ActiveMQServerControlImpl.class);
 
-   // Attributes ----------------------------------------------------
 
    private final PostOffice postOffice;
 
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 6277db9..d9605b3 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
@@ -57,9 +57,6 @@ import org.apache.activemq.artemis.utils.JsonLoader;
 
 public class AddressControlImpl extends AbstractControl implements AddressControl {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
 
    private AddressInfo addressInfo;
 
@@ -73,9 +70,6 @@ public class AddressControlImpl extends AbstractControl implements AddressContro
 
    private final ManagementService managementService;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    public AddressControlImpl(AddressInfo addressInfo,
                              final ActiveMQServer server,
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 efcd5b0..ab65d9e 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
@@ -28,19 +28,12 @@ import javax.management.MBeanOperationInfo;
 
 public class BaseBroadcastGroupControlImpl extends AbstractControl implements BaseBroadcastGroupControl {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
    private Class broadcastGroupControlClass;
 
    private final BroadcastGroup broadcastGroup;
 
    private final BroadcastGroupConfiguration configuration;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    public BaseBroadcastGroupControlImpl(final BroadcastGroup broadcastGroup,
                                         final StorageManager storageManager,
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 c09d5d5..06fd5a4 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
@@ -31,17 +31,11 @@ import org.apache.activemq.artemis.logs.AuditLogger;
 
 public class BridgeControlImpl extends AbstractControl implements BridgeControl {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
 
    private final Bridge bridge;
 
    private final BridgeConfiguration configuration;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    public BridgeControlImpl(final Bridge bridge,
                             final StorageManager storageManager,
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 bf50b84..5141a99 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
@@ -25,15 +25,10 @@ import org.apache.activemq.artemis.logs.AuditLogger;
 
 public class BroadcastGroupControlImpl extends BaseBroadcastGroupControlImpl implements BroadcastGroupControl {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
 
    private UDPBroadcastEndpointFactory endpointFactory;
 
-   // Static --------------------------------------------------------
 
-   // Constructors --------------------------------------------------
 
    public BroadcastGroupControlImpl(final BroadcastGroup broadcastGroup,
                                     final StorageManager storageManager,
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 ccdd64a..dd3a716 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
@@ -32,17 +32,13 @@ import org.apache.activemq.artemis.logs.AuditLogger;
 
 public class ClusterConnectionControlImpl extends AbstractControl implements ClusterConnectionControl {
 
-   // Constants -----------------------------------------------------
 
-   // Attributes ----------------------------------------------------
 
    private final ClusterConnection clusterConnection;
 
    private final ClusterConnectionConfiguration configuration;
 
-   // Static --------------------------------------------------------
 
-   // Constructors --------------------------------------------------
 
    public ClusterConnectionControlImpl(final ClusterConnection clusterConnection,
                                        final StorageManager storageManager,
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 946b03c..21b95a3 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
@@ -34,17 +34,11 @@ import org.apache.activemq.artemis.logs.AuditLogger;
 
 public class DivertControlImpl extends AbstractControl implements DivertControl {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
 
    private final Divert divert;
 
    private final String internalNamingPrefix;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // DivertControlMBean implementation ---------------------------
 
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 2f92c32..f72ee95 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
@@ -25,16 +25,9 @@ import org.apache.activemq.artemis.logs.AuditLogger;
 
 public class JGroupsChannelBroadcastGroupControlImpl extends BaseBroadcastGroupControlImpl implements JGroupsChannelBroadcastGroupControl {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
 
    private ChannelBroadcastEndpointFactory endpointFactory;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
-
    public JGroupsChannelBroadcastGroupControlImpl(final BroadcastGroup broadcastGroup,
                                                   final StorageManager storageManager,
                                                   final BroadcastGroupConfiguration configuration,
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 81112b5..8432618 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
@@ -30,15 +30,10 @@ import java.nio.file.Paths;
 
 public class JGroupsFileBroadcastGroupControlImpl extends BaseBroadcastGroupControlImpl implements JGroupsFileBroadcastGroupControl {
 
-   // Constants -----------------------------------------------------
 
-   // Attributes ----------------------------------------------------
 
    private JGroupsFileBroadcastEndpointFactory endpointFactory;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    public JGroupsFileBroadcastGroupControlImpl(final BroadcastGroup broadcastGroup,
                                                final StorageManager storageManager,
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 7ef7047..4f9dd9f 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
@@ -25,15 +25,9 @@ import org.apache.activemq.artemis.logs.AuditLogger;
 
 public class JGroupsPropertiesBroadcastGroupControlImpl extends BaseBroadcastGroupControlImpl implements JGroupsPropertiesBroadcastGroupControl {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
 
    private JGroupsPropertiesBroadcastEndpointFactory endpointFactory;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    public JGroupsPropertiesBroadcastGroupControlImpl(final BroadcastGroup broadcastGroup,
                                                      final StorageManager storageManager,
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 07fc9a8..19a11cc 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
@@ -29,13 +29,7 @@ import org.apache.activemq.artemis.api.core.management.Operation;
 import org.apache.activemq.artemis.api.core.management.Parameter;
 
 public class MBeanInfoHelper {
-   // Constants -----------------------------------------------------
 
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 fbb4d78..00f2780 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
@@ -68,9 +68,6 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
 
    public static final int FLUSH_LIMIT = 500;
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
 
    private final Queue queue;
 
@@ -84,7 +81,6 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
 
    private MessageCounter counter;
 
-   // Static --------------------------------------------------------
 
    private static String toJSON(final Map<String, Object>[] messages) {
       JsonArray array = toJSONMsgArray(messages);
@@ -111,8 +107,6 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
       return arrayReturn.build().toString();
    }
 
-   // Constructors --------------------------------------------------
-
    public QueueControlImpl(final Queue queue,
                            final String address,
                            final ActiveMQServer server,
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 27545a6..ad56455 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
@@ -38,9 +38,7 @@ import static org.apache.activemq.artemis.api.core.JsonUtil.nullSafe;
  * regular intervals - this means we are less intrusive on the queue
  */
 public class MessageCounter {
-   // Constants -----------------------------------------------------
 
-   // Attributes ----------------------------------------------------
 
    // destination related information
    private final String destName;
@@ -75,9 +73,6 @@ public class MessageCounter {
 
    private long lastMessagesAcked;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    /**
     * Constructor
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 8230e01..dcdf7d5 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
@@ -27,11 +27,7 @@ import org.apache.activemq.artemis.core.messagecounter.MessageCounter;
 import org.apache.activemq.artemis.core.messagecounter.MessageCounter.DayCounter;
 
 public class MessageCounterHelper {
-   // Constants -----------------------------------------------------
 
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
 
    public static String listMessageCounterHistory(final MessageCounter counter) throws Exception {
       List<DayCounter> history = counter.getHistory();
@@ -177,8 +173,6 @@ public class MessageCounterHelper {
       }
    }
 
-   // Constructors --------------------------------------------------
-
    // Public --------------------------------------------------------
 
    // Package protected ---------------------------------------------
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 8ae5744..74008fc 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
@@ -56,11 +56,10 @@ import org.jboss.logging.Logger;
  * However I want to keep this isolated as much as possible during development
  */
 public class PageCursorProviderImpl implements PageCursorProvider {
-   // Constants -----------------------------------------------------
+
 
    private static final Logger logger = Logger.getLogger(PageCursorProviderImpl.class);
 
-   // Attributes ----------------------------------------------------
 
    /**
     * As an optimization, avoid subsequent schedules as they are unnecessary
@@ -93,9 +92,7 @@ public class PageCursorProviderImpl implements PageCursorProvider {
    //storageManager.beforePageRead will be attempted in a loop, printing at intervals a warn message
    private static final long PAGE_READ_PERMISSION_TIMEOUT_NS = TimeUnit.SECONDS.toNanos(10);
 
-   // Static --------------------------------------------------------
 
-   // Constructors --------------------------------------------------
    public PageCursorProviderImpl(final PagingStore pagingStore,
                                  final StorageManager storageManager,
                                  final ArtemisExecutor executor,
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/Page.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/Page.java
index 6667d05..c5e707b 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/Page.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/Page.java
@@ -43,7 +43,6 @@ import org.jboss.logging.Logger;
 
 public final class Page implements Comparable<Page> {
 
-   // Constants -----------------------------------------------------
    private static final Logger logger = Logger.getLogger(Page.class);
 
    public static final int SIZE_RECORD = DataConstants.SIZE_BYTE + DataConstants.SIZE_INT + DataConstants.SIZE_BYTE;
@@ -52,7 +51,6 @@ public final class Page implements Comparable<Page> {
 
    private static final byte END_BYTE = (byte) '}';
 
-   // Attributes ----------------------------------------------------
 
    private final int pageId;
 
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 f833b5a..0fc5d65 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
@@ -32,9 +32,7 @@ import org.apache.activemq.artemis.core.server.ActiveMQScheduledComponent;
  */
 final class PageSyncTimer extends ActiveMQScheduledComponent {
 
-   // Constants -----------------------------------------------------
 
-   // Attributes ----------------------------------------------------
 
    private final PagingStore store;
 
@@ -53,9 +51,6 @@ final class PageSyncTimer extends ActiveMQScheduledComponent {
 
    private final List<OperationContext> syncOperations = new LinkedList<>();
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    PageSyncTimer(PagingStore store, ScheduledExecutorService scheduledExecutor, Executor executor, long timeSync) {
       super(scheduledExecutor, executor, timeSync, TimeUnit.NANOSECONDS, true);
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 4684b8b..0281a29 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
@@ -38,9 +38,7 @@ import org.apache.activemq.artemis.utils.DataConstants;
 import org.jboss.logging.Logger;
 
 public final class PageTransactionInfoImpl implements PageTransactionInfo {
-   // Constants -----------------------------------------------------
 
-   // Attributes ----------------------------------------------------
 
    private static final Logger logger = Logger.getLogger(PageTransactionInfoImpl.class);
 
@@ -65,10 +63,6 @@ public final class PageTransactionInfoImpl implements PageTransactionInfo {
 
    private List<LateDelivery> lateDeliveries;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
-
    public PageTransactionInfoImpl(final long transactionID) {
       this();
       this.transactionID = transactionID;
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingManagerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingManagerImpl.java
index 3e10291..d8c90bc 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingManagerImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingManagerImpl.java
@@ -91,11 +91,7 @@ public final class PagingManagerImpl implements PagingManager {
 
    private final SimpleString managementAddress;
 
-   // Static
-   // --------------------------------------------------------------------------------------------------------------------------
 
-   // Constructors
-   // --------------------------------------------------------------------------------------------------------------------
 
 
    // for tests.. not part of the API
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 4d164a5..068b7ae 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
@@ -52,13 +52,12 @@ import org.apache.activemq.artemis.utils.actors.ArtemisExecutor;
  */
 public class PagingStoreFactoryDatabase implements PagingStoreFactory {
 
-   // Constants -----------------------------------------------------
 
    private static final String ADDRESS_FILE = "address.txt";
 
    private static final String DIRECTORY_NAME = "directory.txt";
 
-   // Attributes ----------------------------------------------------
+
 
    protected final boolean syncNonTransactional;
 
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 0a1119e..2d0f24c 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
@@ -54,11 +54,9 @@ import org.apache.activemq.artemis.utils.actors.ArtemisExecutor;
  */
 public class PagingStoreFactoryNIO implements PagingStoreFactory {
 
-   // Constants -----------------------------------------------------
 
    public static final String ADDRESS_FILE = "address.txt";
 
-   // Attributes ----------------------------------------------------
 
    private final File directory;
 
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 d1c5591..7081a26 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
@@ -22,9 +22,7 @@ import org.apache.activemq.artemis.core.journal.EncodingSupport;
 import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
 
 public class PersistedAddressSetting implements EncodingSupport {
-   // Constants -----------------------------------------------------
 
-   // Attributes ----------------------------------------------------
 
    private long storeId;
 
@@ -32,9 +30,6 @@ public class PersistedAddressSetting implements EncodingSupport {
 
    private AddressSettings setting;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    public PersistedAddressSetting() {
       super();
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 f8eeb1f..f2c371b 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
@@ -25,9 +25,6 @@ import static org.apache.activemq.artemis.utils.DataConstants.SIZE_NULL;
 
 public class PersistedSecuritySetting implements EncodingSupport {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
 
    private long storeId;
 
@@ -53,9 +50,6 @@ public class PersistedSecuritySetting implements EncodingSupport {
 
    private SimpleString deleteAddressRoles;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    public PersistedSecuritySetting() {
    }
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/LargeServerMessageImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/LargeServerMessageImpl.java
index 6809808..267e1ef 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/LargeServerMessageImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/LargeServerMessageImpl.java
@@ -68,10 +68,8 @@ public final class LargeServerMessageImpl extends CoreMessage implements CoreLar
       return lsm.toMessage();
    }
 
-   // Constants -----------------------------------------------------
    private static final Logger logger = Logger.getLogger(LargeServerMessageImpl.class);
 
-   // Attributes ----------------------------------------------------
 
    private final StorageManager storageManager;
 
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 af2d15b..da16d50 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
@@ -36,9 +36,7 @@ public class NodeAnnounceMessage extends PacketImpl {
 
    private String scaleDownGroupName;
 
-   // Static --------------------------------------------------------
 
-   // Constructors --------------------------------------------------
 
    public NodeAnnounceMessage(final long currentEventID,
                               final String nodeID,
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 a58c885..0a42f1b 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
@@ -80,13 +80,11 @@ import org.apache.activemq.artemis.utils.ReusableLatch;
 import org.jboss.logging.Logger;
 
 public class RemotingServiceImpl implements RemotingService, ServerConnectionLifeCycleListener {
-   // Constants -----------------------------------------------------
 
    private static final Logger logger = Logger.getLogger(RemotingServiceImpl.class);
 
    private static final int ACCEPTOR_STOP_TIMEOUT = 3000;
 
-   // Attributes ----------------------------------------------------
 
    private volatile boolean started = false;
 
@@ -128,9 +126,6 @@ public class RemotingServiceImpl implements RemotingService, ServerConnectionLif
 
    private long connectionTtlCheckInterval;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    public RemotingServiceImpl(final ClusterManager clusterManager,
                               final Configuration config,
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 63a7bbd..9e2984b 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
@@ -142,7 +142,7 @@ public final class ReplicationEndpoint implements ChannelHandler, ActiveMQCompon
    private final ArrayDeque<Packet> pendingPackets;
 
 
-   // Constructors --------------------------------------------------
+
    public ReplicationEndpoint(final ActiveMQServerImpl server,
                               boolean wantedFailBack,
                               ReplicationEndpointEventListener eventListener) {
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/security/impl/SecurityStoreImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/security/impl/SecurityStoreImpl.java
index 4d2c4bc..188692a 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/security/impl/SecurityStoreImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/security/impl/SecurityStoreImpl.java
@@ -74,7 +74,6 @@ public class SecurityStoreImpl implements SecurityStore, HierarchicalRepositoryC
 
    private final NotificationService notificationService;
 
-   // Constructors --------------------------------------------------
 
    /**
     * @param notificationService can be <code>null</code>
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 6c928d4..4fca439 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
@@ -77,11 +77,11 @@ import org.jboss.logging.Logger;
  */
 
 public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowledgementHandler, ReadyListener, ClientProducerFlowCallback {
-   // Constants -----------------------------------------------------
+
 
    private static final Logger logger = Logger.getLogger(BridgeImpl.class);
 
-   // Attributes ----------------------------------------------------
+
 
    protected final ServerLocatorInternal serverLocator;
 
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/MessageReferenceImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/MessageReferenceImpl.java
index 4938a1b..bf81e74 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/MessageReferenceImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/MessageReferenceImpl.java
@@ -82,13 +82,11 @@ public class MessageReferenceImpl extends LinkedListImpl.Node<MessageReferenceIm
 
    private Consumer<? super MessageReference> onDelivery;
 
-   // Static --------------------------------------------------------
 
    // This value has been computed by using https://github.com/openjdk/jol
    // on HotSpot 64-bit VM COOPS, 8-byte alignment
    private static final int memoryOffset = 72;
 
-   // Constructors --------------------------------------------------
 
    public MessageReferenceImpl() {
       queue = null;
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 8704a39..0bd382f 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
@@ -75,13 +75,10 @@ import org.jboss.logging.Logger;
  * Concrete implementation of a ClientConsumer.
  */
 public class ServerConsumerImpl implements ServerConsumer, ReadyListener {
-   // Constants ------------------------------------------------------------------------------------
 
-   private static final Logger logger = Logger.getLogger(ServerConsumerImpl.class);
 
-   // Static ---------------------------------------------------------------------------------------
+   private static final Logger logger = Logger.getLogger(ServerConsumerImpl.class);
 
-   // Attributes -----------------------------------------------------------------------------------
 
    private final long id;
 
@@ -163,7 +160,6 @@ public class ServerConsumerImpl implements ServerConsumer, ReadyListener {
 
    private boolean isClosed = false;
 
-   // Constructors ---------------------------------------------------------------------------------
 
    public ServerConsumerImpl(final long id,
                              final ServerSession session,
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
index 9ac5129..e80f91c 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
@@ -108,13 +108,11 @@ import static org.apache.activemq.artemis.api.core.JsonUtil.nullSafe;
  * Server side Session implementation
  */
 public class ServerSessionImpl implements ServerSession, FailureListener {
-   // Constants -----------------------------------------------------------------------------
+
 
    private static final Logger logger = Logger.getLogger(ServerSessionImpl.class);
 
-   // Static -------------------------------------------------------------------------------
 
-   // Attributes ----------------------------------------------------------------------------
 
    private boolean securityEnabled = true;
 
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 60c268c..137c7cf 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
@@ -114,7 +114,6 @@ import org.apache.activemq.artemis.utils.collections.TypedProperties;
 import org.jboss.logging.Logger;
 
 public class ManagementServiceImpl implements ManagementService {
-   // Constants -----------------------------------------------------
 
    private static final Logger logger = Logger.getLogger(ManagementServiceImpl.class);
 
@@ -158,9 +157,6 @@ public class ManagementServiceImpl implements ManagementService {
 
    private final ObjectNameBuilder objectNameBuilder;
 
-   // Static --------------------------------------------------------
-
-   // Constructor ----------------------------------------------------
 
    public ManagementServiceImpl(final MBeanServer mbeanServer, final Configuration configuration) {
       this.mbeanServer = mbeanServer;
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 1d575e4..cc81e52 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
@@ -36,7 +36,6 @@ public class ValidatorsTest extends Assert {
       }
    }
 
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 a2b3d44..a38e125 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
@@ -30,13 +30,7 @@ import static org.apache.activemq.artemis.core.security.CheckType.MANAGE;
 import static org.apache.activemq.artemis.core.security.CheckType.SEND;
 
 public class RoleTest extends Assert {
-   // Constants -----------------------------------------------------
 
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 caa8bba..92e38a2 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
@@ -25,13 +25,6 @@ import org.junit.Assert;
 import org.junit.Test;
 
 public class VersionImplTest extends Assert {
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 8e72f0f..14832a3 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
@@ -34,21 +34,15 @@ import javax.jms.TextMessage;
  */
 public class TextReverserService implements MessageListener {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
 
    private final Session session;
 
    private final Connection connection;
 
-   // Static --------------------------------------------------------
-
    private static String reverse(final String text) {
       return new StringBuffer(text).reverse().toString();
    }
 
-   // Constructors --------------------------------------------------
 
    public TextReverserService(final ConnectionFactory cf, final Destination destination) throws JMSException {
       // create a JMS connection
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 f9eea4c..62315d3 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
@@ -34,7 +34,6 @@ public class DummyXid implements Xid {
 
    private boolean hashCalculated;
 
-   // Static --------------------------------------------------------
 
    public static String toBase64String(final Xid xid) {
       return Base64.encodeBytes(DummyXid.toByteArray(xid));
@@ -56,7 +55,7 @@ public class DummyXid implements Xid {
       return hashBytes;
    }
 
-   // Constructors --------------------------------------------------
+
 
    /**
     * Standard constructor
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 a570770..194e7ae 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
@@ -34,7 +34,7 @@ public class DummyXid implements Xid {
 
    private boolean hashCalculated;
 
-   // Static --------------------------------------------------------
+
 
    public static String toBase64String(final Xid xid) {
       return Base64.encodeBytes(DummyXid.toByteArray(xid));
@@ -56,7 +56,7 @@ public class DummyXid implements Xid {
       return hashBytes;
    }
 
-   // Constructors --------------------------------------------------
+
 
    /**
     * Standard constructor
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 a570770..32c6aca 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
@@ -34,7 +34,6 @@ public class DummyXid implements Xid {
 
    private boolean hashCalculated;
 
-   // Static --------------------------------------------------------
 
    public static String toBase64String(final Xid xid) {
       return Base64.encodeBytes(DummyXid.toByteArray(xid));
@@ -56,8 +55,6 @@ public class DummyXid implements Xid {
       return hashBytes;
    }
 
-   // Constructors --------------------------------------------------
-
    /**
     * Standard constructor
     *
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 0e7bc1a..62149d3 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
@@ -27,11 +27,9 @@ import java.util.Properties;
  * @author <a href="mailto:ovidiu@feodorov.com">Ovidiu Feodorov</a>
  */
 public class InVMNameParser implements NameParser, Serializable {
-   // Constants -----------------------------------------------------
 
    private static final long serialVersionUID = 2925203703371001031L;
 
-   // Static --------------------------------------------------------
 
    static Properties syntax;
 
@@ -42,9 +40,6 @@ public class InVMNameParser implements NameParser, Serializable {
       InVMNameParser.syntax.put("jndi.syntax.separator", "/");
    }
 
-   // Attributes ----------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 e1c40b6..88eba94 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
@@ -37,13 +37,10 @@ import java.util.List;
 import java.util.Map;
 
 public class InVMNamingContext implements Context, Serializable {
-   // Constants -----------------------------------------------------
 
    private static final long serialVersionUID = 385743957345L;
 
-   // Static --------------------------------------------------------
 
-   // Attributes ----------------------------------------------------
 
    protected Map<String, Object> map;
 
@@ -51,7 +48,6 @@ public class InVMNamingContext implements Context, Serializable {
 
    private String nameInNamespace = "";
 
-   // Constructors --------------------------------------------------
 
    public InVMNamingContext() {
       map = Collections.synchronizedMap(new HashMap<String, Object>());
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 a7e8cc6..55dad55 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
@@ -47,11 +47,7 @@ import org.junit.Before;
 import org.junit.Test;
 
 public class XATest extends JMSTestBase {
-   // Constants -----------------------------------------------------
 
-   // Static --------------------------------------------------------
-
-   // Attributes ----------------------------------------------------
 
    protected TransactionManager tm;
 
@@ -61,7 +57,6 @@ public class XATest extends JMSTestBase {
 
    protected Queue queue1;
 
-   // Constructors --------------------------------------------------
 
    // TestCase overrides -------------------------------------------
 
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 ed03adb..ae9e4d6 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
@@ -25,15 +25,9 @@ import org.apache.activemq.artemis.core.server.management.NotificationService;
 
 public class SimpleNotificationService implements NotificationService {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
 
    private final List<NotificationListener> listeners = new ArrayList<>();
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // NotificationService implementation ----------------------------
 
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 588ef11..d14f3d8 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
@@ -42,18 +42,13 @@ import org.junit.Test;
  * http://jira.jboss.com/jira/browse/JBAS-2641
  */
 public class String64KLimitTest extends ActiveMQTestBase {
-   // Constants -----------------------------------------------------
 
-   // Static --------------------------------------------------------
-
-   // Attributes ----------------------------------------------------
 
    private ActiveMQServer server;
 
    private ClientSession session;
    private ServerLocator locator;
 
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 3977f97..adb4deb 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
@@ -31,13 +31,6 @@ import org.junit.Test;
 
 public class BlockingSendTest extends ActiveMQTestBase {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 45b95e8..cadf0d4 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
@@ -53,9 +53,7 @@ public class ConsumerCloseTest extends ActiveMQTestBase {
    private SimpleString address;
    private ServerLocator locator;
 
-   // Static --------------------------------------------------------
 
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 53384f5..6338766 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
@@ -34,9 +34,6 @@ import org.junit.Test;
 
 public class DurableQueueTest extends ActiveMQTestBase {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
 
    private ActiveMQServer server;
 
@@ -46,9 +43,6 @@ public class DurableQueueTest extends ActiveMQTestBase {
 
    private ServerLocator locator;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 3d0ac77..d95342e 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
@@ -48,7 +48,7 @@ import org.junit.Test;
  */
 public class ExpiryLargeMessageTest extends ActiveMQTestBase {
 
-   // Constants -----------------------------------------------------
+
    final SimpleString EXPIRY = new SimpleString("my-expiry");
 
    final SimpleString DLQ = new SimpleString("my-DLQ");
@@ -60,11 +60,6 @@ public class ExpiryLargeMessageTest extends ActiveMQTestBase {
    // it has to be an even number
    final int numberOfMessages = 50;
 
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 c64a761..2c7f419 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
@@ -43,21 +43,14 @@ import org.junit.Test;
 
 public class HeuristicXATest extends ActiveMQTestBase {
 
-   // Constants -----------------------------------------------------
    final SimpleString ADDRESS = new SimpleString("ADDRESS");
 
    final String body = "this is the body";
 
-   // Attributes ----------------------------------------------------
-
    private MBeanServer mbeanServer;
 
    private ServerLocator locator;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
-
    // Public --------------------------------------------------------
 
    @Test
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 b296e40..8726ded 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
@@ -56,18 +56,13 @@ public class IncompatibleVersionTest extends SpawnedTestBase {
    private static final Logger log = Logger.getLogger(IncompatibleVersionTest.class);
 
    private static final String WORD_START = "&*STARTED&*";
-   // Constants -----------------------------------------------------
 
-   // Attributes ----------------------------------------------------
 
    private ActiveMQServer server;
 
    private CoreRemotingConnection connection;
    private ServerLocator locator;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/InterruptedLargeMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/InterruptedLargeMessageTest.java
index 3856681..7384a17 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/InterruptedLargeMessageTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/InterruptedLargeMessageTest.java
@@ -73,7 +73,7 @@ import org.junit.Before;
 import org.junit.Test;
 
 public class InterruptedLargeMessageTest extends LargeMessageTestBase {
-   // Constants -----------------------------------------------------
+
 
    static final int RECEIVE_WAIT_TIME = 60000;
 
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 129ef38..76ffbc1 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
@@ -70,13 +70,6 @@ import org.junit.Test;
  */
 public class JmsNettyNioStressTest extends ActiveMQTestBase {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LargeMessageCompressTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LargeMessageCompressTest.java
index e2eae05..eaad11e 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LargeMessageCompressTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LargeMessageCompressTest.java
@@ -54,7 +54,7 @@ import javax.management.openmbean.CompositeData;
  */
 public class LargeMessageCompressTest extends LargeMessageTest {
 
-   // Constructors --------------------------------------------------
+
    public LargeMessageCompressTest(StoreConfiguration.StoreType storeType) {
       super(storeType);
       isCompressedTest = true;
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 80aed4f..400c7ec 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
@@ -28,13 +28,6 @@ import org.junit.Test;
  */
 public class LibaioDependencyCheckTest extends ActiveMQTestBase {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 03d482c..1dbe67d 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
@@ -73,13 +73,6 @@ public class MessageConsumerRollbackTest extends ActiveMQTestBase {
       session.close();
    }
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 8644088..4b94ebb 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
@@ -35,9 +35,6 @@ import org.junit.Test;
 
 public class MessageDurabilityTest extends ActiveMQTestBase {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
 
    private ActiveMQServer server;
 
@@ -47,9 +44,6 @@ public class MessageDurabilityTest extends ActiveMQTestBase {
 
    private ServerLocator locator;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 56ecd1c..f082534 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
@@ -36,11 +36,9 @@ import org.junit.Test;
 
 public class MessagePriorityTest extends ActiveMQTestBase {
 
-   // Constants -----------------------------------------------------
 
    private static final Logger log = Logger.getLogger(MessagePriorityTest.class);
 
-   // Attributes ----------------------------------------------------
 
    private ActiveMQServer server;
 
@@ -49,10 +47,6 @@ public class MessagePriorityTest extends ActiveMQTestBase {
    private ClientSessionFactory sf;
    private ServerLocator locator;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
-
    // Public --------------------------------------------------------
 
    @Test
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 0ce4eda..2bbbb10 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
@@ -37,17 +37,11 @@ import org.junit.Test;
 
 public class MessageRateTest extends ActiveMQTestBase {
 
-   // Constants -----------------------------------------------------
 
    private final SimpleString ADDRESS = new SimpleString("ADDRESS");
 
    private ServerLocator locator;
 
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 eb5b6d4..75d671a 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
@@ -37,17 +37,13 @@ import org.junit.Assert;
 import org.junit.Test;
 
 public class MixRoutingTest extends SingleServerTestBase {
-   // Constants -----------------------------------------------------
+
 
    private static final Logger log = Logger.getLogger(MixRoutingTest.class);
 
    private static final long CONNECTION_TTL = 2000;
 
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
 
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 3986f1c..ab1a6c2 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
@@ -40,11 +40,6 @@ import org.junit.Test;
  */
 public class MultipleThreadFilterOneTest extends ActiveMQTestBase {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
 
    final String ADDRESS = "ADDRESS";
 
@@ -58,7 +53,7 @@ public class MultipleThreadFilterOneTest extends ActiveMQTestBase {
 
    private boolean isNetty = false;
 
-   // Constructors --------------------------------------------------
+
 
    // Public --------------------------------------------------------
 
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 623f8a5..b68464c 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
@@ -48,13 +48,6 @@ public class NIOvsOIOTest extends ActiveMQTestBase {
 
    private static final Logger log = Logger.getLogger(NIOvsOIOTest.class);
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 7ffa5eb..22045ed 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
@@ -18,18 +18,12 @@ package org.apache.activemq.artemis.tests.integration.client;
 
 public class NettyConsumerWindowSizeTest extends ConsumerWindowSizeTest {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
 
    @Override
    protected boolean isNetty() {
       return true;
    }
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 16dd1df..fa393c1 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
@@ -60,9 +60,6 @@ public class OrderTest extends ActiveMQTestBase {
       locator = createNettyNonHALocator();
    }
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 8431867..cb9fddb 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
@@ -43,9 +43,6 @@ import org.junit.Test;
 
 public class RedeliveryConsumerTest extends ActiveMQTestBase {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
 
    ActiveMQServer server;
 
@@ -55,9 +52,6 @@ public class RedeliveryConsumerTest extends ActiveMQTestBase {
 
    private ServerLocator locator;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 bf939cc..8d21f0f 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
@@ -40,17 +40,12 @@ import static org.apache.activemq.artemis.tests.util.RandomUtil.randomXid;
 
 public class SessionCloseTest extends ActiveMQTestBase {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
 
    private ActiveMQServer server;
 
    private ClientSessionFactory sf;
 
-   // Static --------------------------------------------------------
 
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 5aabb1e..8f75f64 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
@@ -55,7 +55,6 @@ public class ClientCrashTest extends ClientTestBase {
    // using short values so this test can run fast
    static final int CONNECTION_TTL = 1000;
 
-   // Constants -----------------------------------------------------
 
    public static final SimpleString QUEUE = new SimpleString("ClientCrashTestQueue");
    public static final SimpleString QUEUE2 = new SimpleString("ClientCrashTestQueue2");
@@ -64,9 +63,6 @@ public class ClientCrashTest extends ClientTestBase {
 
    public static final String MESSAGE_TEXT_FROM_CLIENT = "ClientCrashTest from client";
 
-   // Static --------------------------------------------------------
-
-   // Attributes ----------------------------------------------------
 
    private ClientSessionFactory sf;
 
@@ -86,7 +82,6 @@ public class ClientCrashTest extends ClientTestBase {
       }
    }
 
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 5fc6f1a..5281301 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
@@ -37,24 +37,20 @@ import org.junit.Test;
  * (local server, remote VM client).
  */
 public class ClientExitTest extends ClientTestBase {
-   // Constants ------------------------------------------------------------------------------------
+
 
    private static final String MESSAGE_TEXT = RandomUtil.randomString();
 
    private static final SimpleString QUEUE = new SimpleString("ClientExitTestQueue");
 
-   // Static ---------------------------------------------------------------------------------------
-
    private static final Logger log = Logger.getLogger(ClientExitTest.class);
 
-   // Attributes -----------------------------------------------------------------------------------
+
 
    private ClientSession session;
 
    private ClientConsumer consumer;
 
-   // Constructors ---------------------------------------------------------------------------------
-
    // Public ---------------------------------------------------------------------------------------
 
    @Test
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 13cbc08..332208a 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
@@ -36,9 +36,7 @@ public class CrashClient {
 
    public static int OK = 9;
    public static int NOT_OK = 1;
-   // Constants ------------------------------------------------------------------------------------
 
-   // Static ---------------------------------------------------------------------------------------
 
    public static void main(final String[] args) throws Exception {
       try {
@@ -64,10 +62,6 @@ public class CrashClient {
       }
    }
 
-   // Attributes -----------------------------------------------------------------------------------
-
-   // Constructors ---------------------------------------------------------------------------------
-
    // Command implementation -----------------------------------------------------------------------
 
    // Public ---------------------------------------------------------------------------------------
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 14c2183..637c947 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
@@ -34,9 +34,6 @@ public class CrashClient2 {
 
    private static final Logger log = Logger.getLogger(CrashClient2.class);
    public static final int OK = 9;
-   // Constants ------------------------------------------------------------------------------------
-
-   // Static ---------------------------------------------------------------------------------------
 
    public static void main(final String[] args) throws Exception {
       try {
@@ -76,9 +73,6 @@ public class CrashClient2 {
       }
    }
 
-   // Attributes -----------------------------------------------------------------------------------
-
-   // Constructors ---------------------------------------------------------------------------------
 
    // Command implementation -----------------------------------------------------------------------
 
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 d4d42ca..fd4510a 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
@@ -34,9 +34,6 @@ import org.jboss.logging.Logger;
 public class GracefulClient {
    private static final Logger log = Logger.getLogger(GracefulClient.class);
 
-   // Constants ------------------------------------------------------------------------------------
-
-   // Static ---------------------------------------------------------------------------------------
 
    public static void main(final String[] args) throws Exception {
       if (args.length != 2) {
@@ -70,9 +67,6 @@ public class GracefulClient {
       }
    }
 
-   // Attributes -----------------------------------------------------------------------------------
-
-   // Constructors ---------------------------------------------------------------------------------
 
    // Command implementation -----------------------------------------------------------------------
 
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 4c69112..245dba2 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
@@ -36,13 +36,7 @@ import org.junit.Test;
 public class SimpleSymmetricClusterTest extends ClusterTestBase {
 
    private static final Logger log = Logger.getLogger(SimpleSymmetricClusterTest.class);
-   // Constants -----------------------------------------------------
 
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 2381e6d..0023c1b 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
@@ -20,17 +20,11 @@ import org.apache.activemq.artemis.core.server.cluster.impl.MessageLoadBalancing
 
 public class TwoWayTwoNodeClusterWithDiscoveryTest extends TwoWayTwoNodeClusterTest {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
 
    protected static final String groupAddress = getUDPDiscoveryAddress();
 
    protected static final int groupPort = getUDPDiscoveryPort();
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 c1b9492..9268301 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
@@ -58,7 +58,6 @@ import org.junit.Assert;
 import org.junit.Before;
 
 public abstract class FailoverTestBase extends ActiveMQTestBase {
-   // Constants -----------------------------------------------------
 
    protected static final SimpleString ADDRESS = new SimpleString("FailoverTestAddress");
 
@@ -71,7 +70,6 @@ public abstract class FailoverTestBase extends ActiveMQTestBase {
    protected static final int PAGE_MAX = 2 * 1024;
    protected static final int PAGE_SIZE = 1024;
 
-   // Attributes ----------------------------------------------------
 
    protected TestableServer liveServer;
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/MultipleServerFailoverTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/MultipleServerFailoverTestBase.java
index 75570c2..703f232 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/MultipleServerFailoverTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/MultipleServerFailoverTestBase.java
@@ -65,13 +65,12 @@ public abstract class MultipleServerFailoverTestBase extends ActiveMQTestBase {
       return pluggableQuorumConfiguration;
    }
 
-   // Constants -----------------------------------------------------
+
 
    // TODO: find a better solution for this
    // this is necessary because the cluster connection is using "jms" as its match; see org.apache.activemq.artemis.tests.util.ActiveMQTestBase.basicClusterConnectionConfig()
    protected static final SimpleString ADDRESS = new SimpleString("jms.FailoverTestAddress");
 
-   // Attributes ----------------------------------------------------
 
    protected List<TestableServer> liveServers = new ArrayList<>();
 
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 f660c9f..a10d75c 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
@@ -45,7 +45,7 @@ import org.junit.Test;
  * <br>
  */
 public class PagingFailoverTest extends FailoverTestBase {
-   // Constants -----------------------------------------------------
+
 
    @Rule
    public RetryRule retryRule = new RetryRule(2);
@@ -58,10 +58,6 @@ public class PagingFailoverTest extends FailoverTestBase {
 
    private ClientSessionFactoryInternal sf;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
-
    // Public --------------------------------------------------------
 
    @Override
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 9d249f4..955107e 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
@@ -47,7 +47,6 @@ public abstract class MultiThreadRandomReattachTestBase extends MultiThreadReatt
 
    private static final Logger log = Logger.getLogger(MultiThreadRandomReattachTestBase.class);
 
-   // Constants -----------------------------------------------------
 
    private static final int RECEIVE_TIMEOUT = 30000;
 
@@ -55,14 +54,10 @@ public abstract class MultiThreadRandomReattachTestBase extends MultiThreadReatt
 
    private final int NUM_THREADS = getNumThreads();
 
-   // Attributes ----------------------------------------------------
    protected static final SimpleString ADDRESS = new SimpleString("FailoverTestAddress");
 
    protected ActiveMQServer server;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 931b959..95d69da 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
@@ -41,16 +41,11 @@ import org.junit.Assert;
 import org.junit.Test;
 
 public class OrderReattachTest extends ActiveMQTestBase {
-   // Constants -----------------------------------------------------
 
    final SimpleString ADDRESS = new SimpleString("address");
 
-   // Attributes ----------------------------------------------------
    private ActiveMQServer server;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 5194a97..dee1525 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
@@ -57,11 +57,9 @@ public class RandomReattachTest extends ActiveMQTestBase {
 
    private static final Logger log = Logger.getLogger(RandomReattachTest.class);
 
-   // Constants -----------------------------------------------------
 
    private static final int RECEIVE_TIMEOUT = 10000;
 
-   // Attributes ----------------------------------------------------
 
    private static final SimpleString ADDRESS = new SimpleString("FailoverTestAddress");
 
@@ -69,9 +67,6 @@ public class RandomReattachTest extends ActiveMQTestBase {
 
    private Timer timer;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 bb81924..fa1dfc9 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
@@ -38,7 +38,7 @@ import org.junit.Test;
  * A FloodServerTest
  */
 public class FloodServerTest extends ActiveMQTestBase {
-   // Constants -----------------------------------------------------
+
 
    private static final Logger log = Logger.getLogger(FloodServerTest.class);
 
@@ -46,11 +46,6 @@ public class FloodServerTest extends ActiveMQTestBase {
 
    private final String topicName = "my-topic";
 
-   // Static --------------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // TestCase overrides -------------------------------------------
 
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 322d5f5..5517606 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
@@ -47,7 +47,7 @@ import static java.util.concurrent.TimeUnit.SECONDS;
 
 public class ManualReconnectionToSingleServerTest extends ActiveMQTestBase {
 
-   // Constants -----------------------------------------------------
+
 
    public static final String BROKER_URL = "tcp://localhost:61616?minLargeMessageSize=10000&HA=true&retryInterval=100&reconnectAttempts=20&producerWindowSize=10000";
 
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 9d34da8..c1dceb6 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
@@ -26,13 +26,7 @@ import org.apache.activemq.artemis.tests.util.JMSTestBase;
 import org.junit.Test;
 
 public class CreateQueueTest extends JMSTestBase {
-   // Constants -----------------------------------------------------
 
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 3bd3638..97f6854 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
@@ -31,13 +31,7 @@ import org.apache.activemq.artemis.tests.util.JMSTestBase;
 import org.junit.Test;
 
 public class ExpiryMessageTest extends JMSTestBase {
-   // Constants -----------------------------------------------------
 
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 86f13ed..4afeca2 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
@@ -32,7 +32,7 @@ import org.junit.Assert;
 import org.junit.Test;
 
 public class MessageTest extends JMSTestBase {
-   // Constants -----------------------------------------------------
+
 
    private static final long TIMEOUT = 1000;
 
@@ -42,11 +42,6 @@ public class MessageTest extends JMSTestBase {
 
    private static final String propName3 = "myprop3";
 
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 437897a..1ec9b7f 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
@@ -31,13 +31,6 @@ import org.apache.activemq.artemis.utils.RandomUtil;
 import org.junit.Test;
 
 public class NoLocalSubscriberTest extends JMSTestBase {
-   // Constants -----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 e6b23de..569d1c1 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
@@ -34,15 +34,9 @@ import org.junit.Test;
 
 public class PreACKJMSTest extends JMSTestBase {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
 
    private Queue queue;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 bbb81f8..e05f850 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
@@ -44,15 +44,9 @@ import org.junit.Test;
  */
 public class ReSendMessageTest extends JMSTestBase {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
 
    private Queue queue;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 8521097..b67ca86 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
@@ -41,13 +41,7 @@ import org.junit.Test;
  * A SessionClosedOnRemotingConnectionFailureTest
  */
 public class SessionClosedOnRemotingConnectionFailureTest extends JMSTestBase {
-   // Constants -----------------------------------------------------
 
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 e8b92a1..0ada5fa 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
@@ -34,15 +34,9 @@ import org.junit.Test;
 
 public class TextMessageTest extends JMSTestBase {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
 
    private Queue queue;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 eccb1c8..0de22f9 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
@@ -64,9 +64,6 @@ import org.junit.Test;
  */
 public class JMSFailoverListenerTest extends ActiveMQTestBase {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
 
    protected Configuration backupConf;
 
@@ -86,9 +83,6 @@ public class JMSFailoverListenerTest extends ActiveMQTestBase {
 
    private TransportConfiguration backupAcceptortc;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 7a6ca62..7653620 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
@@ -85,9 +85,7 @@ public class JMSFailoverTest extends ActiveMQTestBase {
 
    private static final Logger log = Logger.getLogger(JMSFailoverTest.class);
 
-   // Constants -----------------------------------------------------
 
-   // Attributes ----------------------------------------------------
 
    protected InVMNamingContext ctx1 = new InVMNamingContext();
 
@@ -115,10 +113,6 @@ public class JMSFailoverTest extends ActiveMQTestBase {
 
    private TransportConfiguration backupAcceptortc;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
-
    // Public --------------------------------------------------------
 
    @Test
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 fab80da..9513372 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
@@ -30,13 +30,6 @@ public class TemporaryQueueClusterTest extends JMSClusteredTestBase {
 
    public static final String QUEUE_NAME = "target";
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 e9e72f9..fe2ca8a 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
@@ -39,13 +39,7 @@ public class TopicClusterTest extends JMSClusteredTestBase {
    // TODO: required to match cluster-connection
    public static final String TOPIC = "jms.t1";
 
-   // Constants -----------------------------------------------------
 
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 f73e934..54a088a 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
@@ -52,14 +52,9 @@ import org.junit.Before;
 import org.junit.Test;
 
 public class ConnectionFactorySerializationTest extends JMSTestBase {
-   // Constants -----------------------------------------------------
 
-   // Static --------------------------------------------------------
-
-   // Attributes ----------------------------------------------------
    protected static ActiveMQConnectionFactory cf;
 
-   // Constructors --------------------------------------------------
    @Override
    @Before
    public void setUp() throws Exception {
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 ff16673..afad205 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
@@ -38,15 +38,11 @@ import org.junit.Before;
 import org.junit.Test;
 
 public class JMSLargeMessageTest extends JMSTestBase {
-   // Constants -----------------------------------------------------
 
-   // Attributes ----------------------------------------------------
 
    Queue queue1;
 
-   // Static --------------------------------------------------------
 
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 3d80e5a..7be6f14 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
@@ -37,15 +37,10 @@ import org.junit.Before;
 import org.junit.Test;
 
 public class JMSServerDeployerTest extends ActiveMQTestBase {
-   // Constants -----------------------------------------------------
 
-   private static final Logger log = org.jboss.logging.Logger.getLogger(JMSServerDeployerTest.class);
-
-   // Attributes ----------------------------------------------------
 
-   // Static --------------------------------------------------------
+   private static final Logger log = org.jboss.logging.Logger.getLogger(JMSServerDeployerTest.class);
 
-   // Constructors --------------------------------------------------
 
    private JMSServerManager jmsServer;
 
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 953d70b..5878ec9 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
@@ -27,13 +27,7 @@ import org.junit.Test;
 
 public class JMSServerConfigParserTest extends ActiveMQTestBase {
 
-   // Constants -----------------------------------------------------
 
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 11dd26b..901c987 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
@@ -57,11 +57,6 @@ import org.junit.Assert;
 
 public class JMSUtil {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
 
    public static Connection createConnection(final String connectorFactory) throws JMSException {
       ActiveMQJMSConnectionFactory cf = (ActiveMQJMSConnectionFactory) ActiveMQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new TransportConfiguration(connectorFactory));
@@ -264,7 +259,6 @@ public class JMSUtil {
       Assert.assertTrue(ok);
    }
 
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 d108958..7dd83f1 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
@@ -33,13 +33,6 @@ public class NIOImportExportTest extends JournalImplTestBase {
       return new NIOSequentialFileFactory(getTestDirfile(), true, 1);
    }
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 e524221..a60c79d 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
@@ -57,17 +57,12 @@ import org.junit.runners.Parameterized;
 @RunWith(Parameterized.class)
 public abstract class LargeMessageTestBase extends ActiveMQTestBase {
 
-   // Constants -----------------------------------------------------
 
    private static final Logger log = Logger.getLogger(LargeMessageTestBase.class);
 
    protected final SimpleString ADDRESS = new SimpleString("SimpleAddress");
 
-   // Attributes ----------------------------------------------------
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 18be7cd..60b3a74 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
@@ -59,11 +59,6 @@ import org.junit.Test;
 
 public class ServerLargeMessageTest extends ActiveMQTestBase {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
 
    String originalPath;
 
@@ -88,7 +83,7 @@ public class ServerLargeMessageTest extends ActiveMQTestBase {
       }
    }
 
-   // Constructors --------------------------------------------------
+
 
    // Public --------------------------------------------------------
 
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 2a37038..faf08af 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
@@ -38,9 +38,7 @@ import org.junit.Assert;
 import org.junit.Test;
 
 public class AcceptorControlTest extends ManagementTestBase {
-   // Static --------------------------------------------------------
 
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 3aa3ddd..1751a10 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
@@ -24,13 +24,6 @@ import org.junit.Test;
 
 public class AcceptorControlUsingCoreTest extends AcceptorControlTest {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // AcceptorControlTest overrides --------------------------------
 
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 7c3fecc..95a0967 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
@@ -114,9 +114,6 @@ public class ActiveMQServerControlTest extends ManagementTestBase {
    @Rule
    public RetryRule retryRule = new RetryRule(0);
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
 
    protected boolean legacyCreateQueue;
 
@@ -135,7 +132,6 @@ public class ActiveMQServerControlTest extends ManagementTestBase {
       this.legacyCreateQueue = legacyCreateQueue;
    }
 
-   // Static --------------------------------------------------------
 
    private static boolean contains(final String name, final String[] strings) {
       boolean found = false;
@@ -148,7 +144,6 @@ public class ActiveMQServerControlTest extends ManagementTestBase {
       return found;
    }
 
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 9c42638..9f65270 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
@@ -28,13 +28,6 @@ import org.junit.runners.Parameterized;
 @RunWith(Parameterized.class)
 public class ActiveMQServerControlUsingCoreTest extends ActiveMQServerControlTest {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    public ActiveMQServerControlUsingCoreTest(boolean legacyCreateQueue) {
       super(legacyCreateQueue);
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 738b47d..4fdc526 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
@@ -24,13 +24,6 @@ import org.apache.activemq.artemis.api.core.management.ResourceNames;
 
 public class AddressControlUsingCoreTest extends AddressControlTest {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
 
    @Override
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 7059a55..7faf982 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
@@ -41,9 +41,6 @@ import org.junit.Test;
 
 public class BridgeControlUsingCoreTest extends ManagementTestBase {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
 
    private ActiveMQServer server_0;
 
@@ -51,9 +48,6 @@ public class BridgeControlUsingCoreTest extends ManagementTestBase {
 
    private ActiveMQServer server_1;
 
-   // Constructors --------------------------------------------------
-
-   // Public --------------------------------------------------------
 
    @Test
    public void testAttributes() throws Exception {
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 4e9a872..eb4ebba 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
@@ -44,9 +44,6 @@ import org.junit.Test;
 
 public class ClusterConnectionControl2Test extends ManagementTestBase {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
 
    private ActiveMQServer server0;
 
@@ -60,7 +57,7 @@ public class ClusterConnectionControl2Test extends ManagementTestBase {
 
    private final String clusterName = "cluster";
 
-   // Constructors --------------------------------------------------
+
 
    // Public --------------------------------------------------------
 
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 604b170..9c57b8e 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
@@ -52,9 +52,6 @@ import org.junit.Test;
 
 public class ClusterConnectionControlTest extends ManagementTestBase {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
 
    private ActiveMQServer server_0;
 
@@ -66,8 +63,6 @@ public class ClusterConnectionControlTest extends ManagementTestBase {
 
    private MBeanServer mbeanServer_1;
 
-   // Constructors --------------------------------------------------
-
    // Public --------------------------------------------------------
 
    @Test
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 0c76a64..1ff0e0f 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
@@ -23,14 +23,6 @@ import org.apache.activemq.artemis.api.core.management.ResourceNames;
 
 public class ClusterConnectionControlUsingCoreTest extends ClusterConnectionControlTest {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
-
    // ClusterConnectionControlTest overrides --------------------------------
 
    @Override
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 3f4e8a1..15aae49 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
@@ -27,17 +27,11 @@ import org.apache.activemq.artemis.api.core.management.ManagementHelper;
 
 public class CoreMessagingProxy {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
 
    private final String resourceName;
 
    private final ServerLocator locator;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    public CoreMessagingProxy(final ServerLocator locator, final String resourceName) throws Exception {
       this.locator = locator;
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 d1424ca..eec9695 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
@@ -35,15 +35,11 @@ import org.junit.Test;
 
 public class DivertControlTest extends ManagementTestBase {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
 
    private ActiveMQServer server;
 
    private DivertConfiguration divertConfig;
 
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 e7d286a..549f324 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
@@ -23,13 +23,6 @@ import org.apache.activemq.artemis.api.core.management.ResourceNames;
 
 public class DivertControlUsingCoreTest extends DivertControlTest {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // DivertControlTest overrides --------------------------------
 
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 4c6b351..1b698a9 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
@@ -38,11 +38,7 @@ import org.apache.activemq.artemis.api.core.RoutingType;
 
 public class ManagementControlHelper {
 
-   // Constants -----------------------------------------------------
 
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
 
    public static AcceptorControl createAcceptorControl(final String name,
                                                        final MBeanServer mbeanServer) throws Exception {
@@ -105,7 +101,7 @@ public class ManagementControlHelper {
       return (BrokerBalancerControl) ManagementControlHelper.createProxy(ObjectNameBuilder.DEFAULT.getBrokerBalancerObjectName(name), BrokerBalancerControl.class, mbeanServer);
    }
 
-   // Constructors --------------------------------------------------
+
 
    // Public --------------------------------------------------------
 
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 9aead03..beb2daf 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
@@ -30,16 +30,9 @@ import org.junit.Test;
 
 public class ManagementHelperTest extends Assert {
 
-   // Constants -----------------------------------------------------
 
    private static final Logger log = Logger.getLogger(ManagementHelperTest.class);
 
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
-
    // Public --------------------------------------------------------
 
    @Test
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 83aeeec..590f0c1 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
@@ -34,13 +34,10 @@ import org.junit.Before;
 
 public abstract class ManagementTestBase extends ActiveMQTestBase {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
 
    protected MBeanServer mbeanServer;
 
-   // Static --------------------------------------------------------
+
 
    protected static void consumeMessages(final int expected,
                                          final ClientSession session,
@@ -64,7 +61,7 @@ public abstract class ManagementTestBase extends ActiveMQTestBase {
       }
    }
 
-   // Constructors --------------------------------------------------
+
 
    // Public --------------------------------------------------------
 
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 e151a1f..81fe2fd 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
@@ -53,9 +53,6 @@ import static org.apache.activemq.artemis.api.core.management.CoreNotificationTy
 
 public class NotificationTest extends ActiveMQTestBase {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
 
    private ActiveMQServer server;
 
@@ -66,9 +63,7 @@ public class NotificationTest extends ActiveMQTestBase {
    private SimpleString notifQueue;
    private ServerLocator locator;
 
-   // Static --------------------------------------------------------
 
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 b9d7aa7..3999efe 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
@@ -31,15 +31,9 @@ import org.junit.Before;
 
 public abstract class SecurityManagementTestBase extends ActiveMQTestBase {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
 
    private ActiveMQServer server;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 bbe97ec..d61834f 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
@@ -29,9 +29,7 @@ import org.junit.Test;
 
 public class SecurityManagementWithConfiguredAdminUserTest extends SecurityManagementTestBase {
 
-   // Constants -----------------------------------------------------
 
-   // Attributes ----------------------------------------------------
 
    private final String validAdminUser = "validAdminUser";
 
@@ -41,9 +39,7 @@ public class SecurityManagementWithConfiguredAdminUserTest extends SecurityManag
 
    private final String invalidAdminPassword = "invalidAdminPassword";
 
-   // Static --------------------------------------------------------
 
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 ef8bb40..bc9d424 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
@@ -24,16 +24,10 @@ import org.junit.Test;
 
 public class SecurityManagementWithModifiedConfigurationTest extends SecurityManagementTestBase {
 
-   // Constants -----------------------------------------------------
 
-   // Attributes ----------------------------------------------------
 
    private final String configuredClusterPassword = "this is not the default password";
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
-
    // Public --------------------------------------------------------
 
    @Test
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 0bed0fb..2177f51 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
@@ -48,9 +48,6 @@ import static org.apache.activemq.artemis.api.core.management.CoreNotificationTy
 
 public class SecurityNotificationTest extends ActiveMQTestBase {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
 
    private ActiveMQServer server;
 
@@ -60,9 +57,6 @@ public class SecurityNotificationTest extends ActiveMQTestBase {
 
    private SimpleString notifQueue;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 a46b285..5eff637 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
@@ -44,17 +44,12 @@ import org.junit.Test;
 
 public class PagingCounterTest extends ActiveMQTestBase {
 
-   // Constants -----------------------------------------------------
 
-   // Attributes ----------------------------------------------------
 
    private ActiveMQServer server;
 
    private ServerLocator sl;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingOrderTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingOrderTest.java
index 886a029..e598356 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingOrderTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingOrderTest.java
@@ -68,9 +68,6 @@ public class PagingOrderTest extends ActiveMQTestBase {
 
    private static final int PAGE_SIZE = 10 * 1024;
 
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
 
    static final SimpleString ADDRESS = new SimpleString("SimpleAddress");
 
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 8ea2757..286fefd 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
@@ -46,9 +46,7 @@ public class PagingSyncTest extends ActiveMQTestBase {
 
    private static final int PAGE_SIZE = 10 * 1024;
 
-   // Attributes ----------------------------------------------------
 
-   // Static --------------------------------------------------------
 
    static final SimpleString ADDRESS = new SimpleString("SimpleAddress");
 
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 2fa004b..90bd83b 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
@@ -34,15 +34,10 @@ import org.junit.Test;
 
 public class DeleteQueueRestartTest extends ActiveMQTestBase {
 
-   // Constants -----------------------------------------------------
 
-   private static final String ADDRESS = "ADDRESS";
-
-   // Attributes ----------------------------------------------------
 
-   // Static --------------------------------------------------------
+   private static final String ADDRESS = "ADDRESS";
 
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 f5b5cd0..ce75534 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
@@ -34,9 +34,6 @@ import org.junit.Test;
 
 public class ExportFormatTest extends ActiveMQTestBase {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
 
    // Case the format was changed, and the change was agreed, use _testCreateFormat to recreate this field
    String bindingsFile = "#File,JournalFileImpl: (activemq-bindings-1.bindings id = 1, recordID = 1)\n" +
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 790fc3b..b26bb89 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
@@ -32,13 +32,6 @@ public class JMSDynamicConfigTest extends JMSTestBase {
       return true;
    }
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 fd8d275..1f1201a 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
@@ -26,15 +26,9 @@ import org.junit.Test;
 
 public class QueueConfigRestartTest extends ActiveMQTestBase {
 
-   // Constants -----------------------------------------------------
 
    private static final String ADDRESS = "ADDRESS";
 
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 4238196..5dc3553 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
@@ -36,17 +36,13 @@ import org.junit.Test;
 
 public class RestartSMTest extends ActiveMQTestBase {
 
-   // Constants -----------------------------------------------------
 
-   // Attributes ----------------------------------------------------
 
    ExecutorService executor;
 
    ExecutorFactory execFactory;
 
-   // Static --------------------------------------------------------
 
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 7cb280c..796ce01 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,14 +34,6 @@ import org.junit.Test;
 
 public class TransportConfigurationEncodingSupportTest extends Assert {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
-
    // Public --------------------------------------------------------
 
    @Test
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 c92f758..5e5bb12 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
@@ -23,13 +23,6 @@ import org.junit.Test;
 
 public class ActiveMQActivationTest extends ActiveMQTestBase {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 ef232a6..437d439 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
@@ -21,13 +21,6 @@ import org.junit.Test;
 
 public class DestroyConsumerTest extends ActiveMQTestBase {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 93e9383..a63c22b 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
@@ -40,11 +40,6 @@ import org.junit.Test;
 
 public abstract class NetworkAddressTestBase extends ActiveMQTestBase {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
 
    static {
       try {
@@ -78,7 +73,6 @@ public abstract class NetworkAddressTestBase extends ActiveMQTestBase {
       return map;
    }
 
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 6affcf9..5dab716 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
@@ -44,19 +44,14 @@ import org.junit.Before;
 import org.junit.Test;
 
 public class PingTest extends ActiveMQTestBase {
-   // Constants -----------------------------------------------------
 
    private static final Logger log = Logger.getLogger(PingTest.class);
 
    private static final long CLIENT_FAILURE_CHECK_PERIOD = 500;
 
-   // Attributes ----------------------------------------------------
 
    private ActiveMQServer server;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 bd48ac1..7507cfb 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
@@ -30,9 +30,6 @@ public class SynchronousCloseTest extends ActiveMQTestBase {
 
    private ActiveMQServer server;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 64d89ef..b8a1686 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
@@ -63,11 +63,7 @@ public class JMSClusteredTestBase extends ActiveMQTestBase {
 
    protected static final int MAX_HOPS = 1;
 
-   // Static --------------------------------------------------------
 
-   // Attributes ----------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // TestCase overrides -------------------------------------------
 
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 a3285bc..9eb47af 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
@@ -30,15 +30,9 @@ import org.junit.Test;
 
 public class AutoAckMessageListenerTest extends JMSTestCase {
 
-   // Constants -----------------------------------------------------
 
    private static final JmsTestLogger log = JmsTestLogger.LOGGER;
 
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 e86fee9..f014fa9 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
@@ -31,14 +31,9 @@ import org.junit.Test;
  * Safeguards for previously detected TCK failures.
  */
 public class CTSMiscellaneousTest extends JMSTest {
-   // Constants -----------------------------------------------------
 
-   // Static --------------------------------------------------------
-
-   // Attributes ----------------------------------------------------
    protected static ActiveMQConnectionFactory cf;
 
-   // Constructors --------------------------------------------------
    @Override
    @Before
    public void setUp() throws Exception {
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 f2ac432..f95abcf 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
@@ -35,13 +35,7 @@ import org.junit.Test;
  * All tests related to closing a Connection.
  */
 public class ConnectionClosedTest extends JMSTestCase {
-   // Constants -----------------------------------------------------
 
-   // Static --------------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // TestCase overrides -------------------------------------------
 
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 8aac280..99dfbb5 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
@@ -35,15 +35,9 @@ import org.junit.Test;
  * which go to ConnectionClosedTest.
  */
 public class ConnectionTest extends JMSTestCase {
-   // Constants -----------------------------------------------------
 
    private static final JmsTestLogger log = JmsTestLogger.LOGGER;
 
-   // Static --------------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // TestCase overrides -------------------------------------------
 
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 2505db5..cd1e5fc 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
@@ -25,18 +25,13 @@ import javax.naming.InitialContext;
 import org.junit.Test;
 
 public class ConsumerClosedTest extends JMSTestCase {
-   // Constants -----------------------------------------------------
 
-   public static final int NUMBER_OF_MESSAGES = 10;
 
-   // Static --------------------------------------------------------
+   public static final int NUMBER_OF_MESSAGES = 10;
 
-   // Attributes ----------------------------------------------------
 
    InitialContext ic;
 
-   // Constructors --------------------------------------------------
-
    // Public --------------------------------------------------------
 
    @Test
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 bb7ecfe..f48b3dc 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
@@ -39,13 +39,7 @@ import org.junit.Test;
  * MessageConsumerTest.
  */
 public class DurableSubscriptionTest extends JMSTestCase {
-   // Constants -----------------------------------------------------
 
-   // Static --------------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 2395f6f..830f844 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
@@ -34,13 +34,6 @@ import org.junit.Test;
  */
 public class MessageWithReadResolveTest extends JMSTestCase {
 
-   // Constants -----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // TestCase overrides -------------------------------------------
 
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 9ee99b0..7c55f1b 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
@@ -35,13 +35,6 @@ import org.junit.Test;
  * Various use cases, added here while trying things or fixing forum issues.
  */
 public class MiscellaneousTest extends JMSTestCase {
-   // Constants -----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    @Override
    @After
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 ad0530f..daf7fb5 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
@@ -28,13 +28,7 @@ import org.junit.Test;
  * Non-durable subscriber tests.
  */
 public class NonDurableSubscriberTest extends JMSTestCase {
-   // Constants -----------------------------------------------------
 
-   // Static --------------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 1795193..9a77f86 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
@@ -42,13 +42,7 @@ import org.junit.Test;
  * All administered objects should be referenceable and serializable as per spec 4.2
  */
 public class ReferenceableTest extends JMSTestCase {
-   // Constants -----------------------------------------------------
 
-   // Static --------------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 c2e700a..a1b43b6 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
@@ -39,13 +39,7 @@ import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
 import org.junit.Test;
 
 public class SessionTest extends ActiveMQServerTestCase {
-   // Constants -----------------------------------------------------
 
-   // Static --------------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 f43dd4e..2566601 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
@@ -31,13 +31,7 @@ import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
 import org.junit.Test;
 
 public class TemporaryDestinationTest extends JMSTestCase {
-   // Constants -----------------------------------------------------
 
-   // Static --------------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 c2bf023..4e7cb67 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
@@ -32,13 +32,7 @@ import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
 import org.junit.Test;
 
 public class TopicTest extends JMSTestCase {
-   // Constants -----------------------------------------------------
 
-   // Static --------------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 5d8ded1..fe72db2 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
@@ -28,13 +28,7 @@ import org.junit.Before;
  * A test that sends/receives bytes messages to the JMS provider and verifies their integrity.
  */
 public class BytesMessageTest extends MessageTestBase {
-   // Constants -----------------------------------------------------
 
-   // Static --------------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 9f691ac..8933fe9 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
@@ -22,13 +22,7 @@ import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
 import org.junit.Test;
 
 public class JMSCorrelationIDHeaderTest extends MessageHeaderTestBase {
-   // Constants -----------------------------------------------------
 
-   // Static --------------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 1c066d7..eac8f79 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
@@ -23,13 +23,6 @@ import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
 import org.junit.Test;
 
 public class JMSDeliveryModeHeaderTest extends MessageHeaderTestBase {
-   // Constants -----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 cfc277e..5962b8c 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
@@ -22,13 +22,7 @@ import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
 import org.junit.Test;
 
 public class JMSDestinationHeaderTest extends MessageHeaderTestBase {
-   // Constants -----------------------------------------------------
 
-   // Static --------------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 428593a..1147a43 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
@@ -29,11 +29,7 @@ import org.junit.Before;
 import org.junit.Test;
 
 public class JMSExpirationHeaderTest extends MessageHeaderTestBase {
-   // Constants -----------------------------------------------------
 
-   // Static --------------------------------------------------------
-
-   // Attributes ----------------------------------------------------
 
    private volatile boolean testFailed;
 
@@ -41,7 +37,6 @@ public class JMSExpirationHeaderTest extends MessageHeaderTestBase {
 
    private volatile Message expectedMessage;
 
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 82a8ae4..d81158d 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
@@ -22,13 +22,7 @@ import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
 import org.junit.Test;
 
 public class JMSMessageIDHeaderTest extends MessageHeaderTestBase {
-   // Constants -----------------------------------------------------
 
-   // Static --------------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 5556cc5..cc7917d 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
@@ -26,13 +26,7 @@ import org.junit.Test;
  * A JMSReplyToHeaderTest
  */
 public class JMSReplyToHeaderTest extends MessageHeaderTestBase {
-   // Constants -----------------------------------------------------
 
-   // Static --------------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 8b4cb26..c856adb 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
@@ -22,13 +22,7 @@ import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
 import org.junit.Test;
 
 public class JMSTimestampHeaderTest extends MessageHeaderTestBase {
-   // Constants -----------------------------------------------------
 
-   // Static --------------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 c68d43c..4bec001 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
@@ -22,13 +22,7 @@ import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
 import org.junit.Test;
 
 public class JMSTypeHeaderTest extends MessageHeaderTestBase {
-   // Constants -----------------------------------------------------
 
-   // Static --------------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 0bf5503..9a95513 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
@@ -29,13 +29,6 @@ import org.junit.Test;
  * A test that sends/receives map messages to the JMS provider and verifies their integrity.
  */
 public class MapMessageTest extends MessageTestBase {
-   // Constants -----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 143061e..a38ce30 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
@@ -63,13 +63,7 @@ import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
 import org.junit.Test;
 
 public class MessageHeaderTest extends MessageHeaderTestBase {
-   // Constants -----------------------------------------------------
 
-   // Static --------------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageHeaderTestBase.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageHeaderTestBase.java
index 0f6e77c..e101f43 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageHeaderTestBase.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageHeaderTestBase.java
@@ -44,9 +44,6 @@ import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
 import org.junit.Before;
 
 public abstract class MessageHeaderTestBase extends ActiveMQServerTestCase {
-   // Constants -----------------------------------------------------
-
-   // Static --------------------------------------------------------
 
    /**
     * Loads the message header fields with significant values.
@@ -343,7 +340,6 @@ public abstract class MessageHeaderTestBase extends ActiveMQServerTestCase {
       ProxyAssertSupport.assertEquals(m1.getText(), m2.getText());
    }
 
-   // Attributes ----------------------------------------------------
 
    protected Connection producerConnection, consumerConnection;
 
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 f2a8904..03ed0d4 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
@@ -39,7 +39,7 @@ import org.junit.Test;
  * Testing of message property conversion. See {@link javax.jms.Message} for details
  */
 public class MessagePropertyConversionTest extends ActiveMQServerTestCase {
-   // Attributes ----------------------------------------------------
+
 
    private Connection producerConnection, consumerConnection;
 
@@ -49,7 +49,7 @@ public class MessagePropertyConversionTest extends ActiveMQServerTestCase {
 
    private MessageConsumer queueConsumer;
 
-   // Constructors --------------------------------------------------
+
 
    // Public --------------------------------------------------------
 
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 66fb415..c4aace7 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
@@ -31,11 +31,7 @@ import org.junit.Before;
 import org.junit.Test;
 
 public abstract class MessageTestBase extends ActiveMQServerTestCase {
-   // Constants -----------------------------------------------------
 
-   // Static --------------------------------------------------------
-
-   // Attributes ----------------------------------------------------
 
    protected Message message;
 
@@ -47,8 +43,6 @@ public abstract class MessageTestBase extends ActiveMQServerTestCase {
 
    protected MessageConsumer queueCons;
 
-   // Constructors --------------------------------------------------
-
    // Public --------------------------------------------------------
 
    @Override
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 21eeeca..9ef2cba 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
@@ -32,13 +32,7 @@ import org.junit.Test;
  * ObjectMessageDeliveryTest
  */
 public class ObjectMessageDeliveryTest extends ActiveMQServerTestCase {
-   // Constants -----------------------------------------------------
 
-   // Static --------------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 9fc193f..8b80bd7 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
@@ -30,9 +30,7 @@ import java.io.EOFException;
 import java.io.IOException;
 
 public class SimpleJMSBytesMessage extends SimpleJMSMessage implements BytesMessage {
-   // Static -------------------------------------------------------
 
-   // Attributes ----------------------------------------------------
 
    protected byte[] internalArray;
 
@@ -46,7 +44,6 @@ public class SimpleJMSBytesMessage extends SimpleJMSMessage implements BytesMess
 
    private transient DataInputStream m;
 
-   // Constructor ---------------------------------------------------
 
    public SimpleJMSBytesMessage() {
       ostream = new ByteArrayOutputStream();
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 722b1e0..4383c78 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
@@ -26,17 +26,12 @@ import java.util.HashMap;
 import java.util.Map;
 
 public class SimpleJMSMapMessage extends SimpleJMSMessage implements MapMessage {
-   // Constants -----------------------------------------------------
 
-   // Attributes ----------------------------------------------------
 
    protected Map<String, Object> content;
 
    protected boolean bodyReadOnly = false;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    public SimpleJMSMapMessage() {
       content = new HashMap<>();
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 f9cc393..d1eac33 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
@@ -32,7 +32,7 @@ public class SimpleJMSMessage implements Message {
 
    private boolean ignoreSetDestination;
 
-   // Constructors --------------------------------------------------
+
 
    public SimpleJMSMessage() {
       properties.put("JMSXDeliveryCount", Integer.valueOf(0));
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 5b9bc3d..0682ade 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
@@ -21,15 +21,10 @@ import javax.jms.ObjectMessage;
 import java.io.Serializable;
 
 public class SimpleJMSObjectMessage extends SimpleJMSMessage implements ObjectMessage {
-   // Constants -----------------------------------------------------
 
-   // Static --------------------------------------------------------
-
-   // Attributes ----------------------------------------------------
 
    private Serializable object;
 
-   // Constructors --------------------------------------------------
 
    // ObjectMessage implementation ----------------------------------
 
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 6e9cff2..67eaa82 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
@@ -26,9 +26,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class SimpleJMSStreamMessage extends SimpleJMSMessage implements StreamMessage {
-   // Constants -----------------------------------------------------
 
-   // Attributes ----------------------------------------------------
 
    protected List<Object> content;
 
@@ -42,9 +40,6 @@ public class SimpleJMSStreamMessage extends SimpleJMSMessage implements StreamMe
 
    // protected transient boolean deserialised;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    public SimpleJMSStreamMessage() {
       content = new ArrayList<>();
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 8860b71..d828dec 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
@@ -20,15 +20,10 @@ import javax.jms.JMSException;
 import javax.jms.TextMessage;
 
 public class SimpleJMSTextMessage extends SimpleJMSMessage implements TextMessage {
-   // Constants -----------------------------------------------------
 
-   // Static --------------------------------------------------------
-
-   // Attributes ----------------------------------------------------
 
    private String text;
 
-   // Constructors --------------------------------------------------
 
    public SimpleJMSTextMessage() {
       this(null);
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 f22b646..ed10066 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
@@ -29,13 +29,6 @@ import org.junit.Test;
  * A test that sends/receives stream messages to the JMS provider and verifies their integrity.
  */
 public class StreamMessageTest extends MessageTestBase {
-   // Constants -----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 efdeada..c372881 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
@@ -29,13 +29,6 @@ import org.junit.Test;
  * A test that sends/receives text messages to the JMS provider and verifies their integrity.
  */
 public class TextMessageTest extends MessageTestBase {
-   // Constants -----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/ServerManagement.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/ServerManagement.java
index 8abefa7..e7579bb 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/ServerManagement.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/ServerManagement.java
@@ -30,7 +30,7 @@ import org.apache.activemq.artemis.jms.tests.tools.container.Server;
  * is also use to start/stop a remote server.
  */
 public class ServerManagement {
-   // Constants -----------------------------------------------------
+
 
    // logging levels used by the remote client to forward log output on a remote server
    public static int FATAL = 0;
@@ -49,7 +49,6 @@ public class ServerManagement {
 
    public static final String DEFAULT_TOPIC_CONTEXT = "/topic";
 
-   // Static --------------------------------------------------------
 
    private static JmsTestLogger log = JmsTestLogger.LOGGER;
 
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 2e2e2bb..a29197a 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
@@ -17,15 +17,11 @@
 package org.apache.activemq.artemis.jms.tests.tools.container;
 
 public class Constants {
-   // Constants -----------------------------------------------------
 
-   public static final String SERVER_INDEX_PROPERTY_NAME = "activemq.test.server.index";
 
-   // Static --------------------------------------------------------
+   public static final String SERVER_INDEX_PROPERTY_NAME = "activemq.test.server.index";
 
-   // Attributes ----------------------------------------------------
 
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 3745e6b..1d6fed6 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
@@ -39,15 +39,12 @@ import java.util.Map;
 import org.apache.activemq.artemis.jms.tests.JmsTestLogger;
 
 public class InVMContext implements Context, Serializable {
-   // Constants -----------------------------------------------------
 
    private static final long serialVersionUID = 385743957345L;
 
    private static final JmsTestLogger log = JmsTestLogger.LOGGER;
 
-   // Static --------------------------------------------------------
 
-   // Attributes ----------------------------------------------------
 
    protected Map<String, Object> map;
 
@@ -55,7 +52,6 @@ public class InVMContext implements Context, Serializable {
 
    private String nameInNamespace = "";
 
-   // Constructors --------------------------------------------------
 
    public InVMContext() {
       map = Collections.synchronizedMap(new HashMap<String, Object>());
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 3e23e04..5966c96 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
@@ -27,9 +27,7 @@ import java.util.Map;
  * An in-VM JNDI InitialContextFactory. Lightweight JNDI implementation used for testing.
  */
 public class InVMInitialContextFactory implements InitialContextFactory {
-   // Constants -----------------------------------------------------
 
-   // Static --------------------------------------------------------
 
    private static final Map<Integer, Context> initialContexts = new HashMap<>();
 
@@ -47,10 +45,6 @@ public class InVMInitialContextFactory implements InitialContextFactory {
       return env;
    }
 
-   // Attributes ----------------------------------------------------
-
-   // Constructors --------------------------------------------------
-
    // Public --------------------------------------------------------
 
    @Override
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 3bb994c..2dbe3aa 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
@@ -24,15 +24,11 @@ import java.util.Hashtable;
 import org.apache.activemq.artemis.jms.tests.JmsTestLogger;
 
 public class InVMInitialContextFactoryBuilder implements InitialContextFactoryBuilder {
-   // Constants ------------------------------------------------------------------------------------
 
-   private static final JmsTestLogger log = JmsTestLogger.LOGGER;
 
-   // Static ---------------------------------------------------------------------------------------
+   private static final JmsTestLogger log = JmsTestLogger.LOGGER;
 
-   // Attributes -----------------------------------------------------------------------------------
 
-   // Constructors ---------------------------------------------------------------------------------
 
    public InVMInitialContextFactoryBuilder() {
    }
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 897256d..3a25e26 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
@@ -24,11 +24,11 @@ import java.io.Serializable;
 import java.util.Properties;
 
 public class InVMNameParser implements NameParser, Serializable {
-   // Constants -----------------------------------------------------
+
 
    private static final long serialVersionUID = 2925203703371001031L;
 
-   // Static --------------------------------------------------------
+
 
    static Properties syntax;
 
@@ -39,9 +39,6 @@ public class InVMNameParser implements NameParser, Serializable {
       InVMNameParser.syntax.put("jndi.syntax.separator", "/");
    }
 
-   // Attributes ----------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 64f6626..5acbaa4 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
@@ -51,14 +51,13 @@ import org.apache.activemq.artemis.spi.core.security.ActiveMQJAASSecurityManager
 import org.apache.activemq.artemis.spi.core.security.jaas.InVMLoginModule;
 
 public class LocalTestServer implements Server, Runnable {
-   // Constants ------------------------------------------------------------------------------------
 
    private boolean started = false;
 
    private final HashMap<String, List<String>> allBindings = new HashMap<>();
    private JMSServerManagerImpl jmsServerManager;
 
-   // Static ---------------------------------------------------------------------------------------
+
 
    public static void setEnvironmentServerIndex(final int serverIndex) {
       System.setProperty(Constants.SERVER_INDEX_PROPERTY_NAME, Integer.toString(serverIndex));
@@ -68,11 +67,9 @@ public class LocalTestServer implements Server, Runnable {
       System.getProperty(Constants.SERVER_INDEX_PROPERTY_NAME, null);
    }
 
-   // Attributes -----------------------------------------------------------------------------------
 
    private final int serverIndex;
 
-   // Constructors ---------------------------------------------------------------------------------
 
    public LocalTestServer() {
       super();
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 061d435..56873ee 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
@@ -25,15 +25,10 @@ import org.junit.Before;
 import org.junit.Test;
 
 public class JNDIUtilTest extends ActiveMQServerTestCase {
-   // Constants -----------------------------------------------------
 
-   // Static --------------------------------------------------------
-
-   // Attributes ----------------------------------------------------
 
    private InitialContext ic;
 
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 d80d9c9..11f16b6 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
@@ -99,7 +99,7 @@ public class SpawnedJMSServer {
       server = null;
    }
 
-   // Constructors --------------------------------------------------
+
 
    // Public --------------------------------------------------------
 
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 a39575c..8cca6b6 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
@@ -36,10 +36,9 @@ import org.jboss.logging.Logger;
  */
 public abstract class ClientAbstract extends Thread {
 
-   // Constants -----------------------------------------------------
+
    private static final Logger log = Logger.getLogger(ClientAbstract.class);
 
-   // Attributes ----------------------------------------------------
 
    protected ClientSession session;
 
@@ -57,9 +56,6 @@ public abstract class ClientAbstract extends Thread {
     */
    protected volatile boolean pendingCommit = false;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    public ClientAbstract(ClientSessionFactory sf) {
       this.sf = sf;
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 a1054fb..728b989 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
@@ -35,9 +35,6 @@ import org.junit.Test;
 
 public class ClientNonDivertedSoakTest extends ActiveMQTestBase {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
 
    private static final SimpleString ADDRESS = new SimpleString("ADD");
 
@@ -49,9 +46,6 @@ public class ClientNonDivertedSoakTest extends ActiveMQTestBase {
       return false;
    }
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 4fae524..b1451c6 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
@@ -37,9 +37,7 @@ import org.junit.Test;
 
 public class ClientSoakTest extends ActiveMQTestBase {
 
-   // Constants -----------------------------------------------------
 
-   // Attributes ----------------------------------------------------
 
    private static final SimpleString ADDRESS = new SimpleString("ADD");
 
@@ -55,9 +53,6 @@ public class ClientSoakTest extends ActiveMQTestBase {
       return true;
    }
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 aef8e5e..bd0d084 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
@@ -27,9 +27,6 @@ import org.apache.activemq.artemis.utils.ReusableLatch;
 
 public class Receiver extends ClientAbstract {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
 
    // We should leave some messages on paging. We don't want to consume all for this test
    private final Semaphore minConsume = new Semaphore(0);
@@ -51,10 +48,6 @@ public class Receiver extends ClientAbstract {
 
    protected ClientConsumer cons;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
-
    public Receiver(ClientSessionFactory sf, String queue) {
       super(sf);
       this.queue = queue;
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 26f0063..d8217b8 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
@@ -22,9 +22,6 @@ import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
 
 public class Sender extends ClientAbstract {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
 
    protected ClientProducer producer;
 
@@ -36,10 +33,6 @@ public class Sender extends ClientAbstract {
 
    protected final Receiver[] receivers;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
-
    // Public --------------------------------------------------------
 
    public Sender(final ClientSessionFactory sf, String queue, final Receiver[] receivers) {
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 57e71d6..a4e2faf 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
@@ -35,9 +35,6 @@ import org.junit.Test;
 
 public class SimpleSendReceiveSoakTest extends ActiveMQTestBase {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
 
    private static final SimpleString ADDRESS = new SimpleString("ADD");
 
@@ -49,9 +46,6 @@ public class SimpleSendReceiveSoakTest extends ActiveMQTestBase {
       return false;
    }
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 9cae53d..73afcb9 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
@@ -26,13 +26,6 @@ public class LargeMessageStressTest extends LargeMessageTestBase {
       super(storeType);
    }
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 428b3ef..57f848d 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
@@ -30,13 +30,6 @@ import org.junit.Test;
 
 public class SendStressTest extends ActiveMQTestBase {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 854f3be..18aaf62 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
@@ -20,13 +20,6 @@ import org.apache.activemq.artemis.tests.integration.cluster.reattach.RandomReat
 
 public class RandomReattachStressTest extends RandomReattachTest {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 b260436..ae1ba06 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
@@ -24,13 +24,6 @@ import org.apache.activemq.artemis.core.io.aio.AIOSequentialFileFactory;
 
 public class AIOAllPossibilitiesCompactStressTest extends AllPossibilitiesCompactStressTest {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 0162dcc..608c354 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
@@ -32,7 +32,7 @@ import org.junit.Test;
 
 public class AddAndRemoveStressTest extends ActiveMQTestBase {
 
-   // Constants -----------------------------------------------------
+
 
    private static final LoaderCallback dummyLoader = new LoaderCallback() {
 
@@ -63,11 +63,7 @@ public class AddAndRemoveStressTest extends ActiveMQTestBase {
 
    private static final int NUMBER_OF_FILES_ON_JOURNAL = 6;
 
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
 
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 864208f..b874fb7 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
@@ -38,9 +38,7 @@ import org.junit.Test;
 
 public class CompactingStressTest extends ActiveMQTestBase {
 
-   // Constants -----------------------------------------------------
 
-   // Attributes ----------------------------------------------------
 
    private static final String AD1 = "ad1";
 
@@ -60,9 +58,7 @@ public class CompactingStressTest extends ActiveMQTestBase {
 
    private ClientSessionFactory sf;
 
-   // Static --------------------------------------------------------
 
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 e249f77..28b68af 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
@@ -508,13 +508,6 @@ public class JournalCleanupCompactStressTest extends ActiveMQTestBase {
       }
    }
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 a3dd805..1508ed4 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
@@ -38,13 +38,7 @@ import org.junit.Test;
  */
 public class JournalRestartStressTest extends ActiveMQTestBase {
 
-   // Constants -----------------------------------------------------
 
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 d1f8be0..6d5ab32 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
@@ -38,9 +38,7 @@ import org.junit.Test;
 
 public class LargeJournalStressTest extends ActiveMQTestBase {
 
-   // Constants -----------------------------------------------------
 
-   // Attributes ----------------------------------------------------
 
    private static final String AD1 = "ad1";
 
@@ -56,9 +54,6 @@ public class LargeJournalStressTest extends ActiveMQTestBase {
 
    private ServerLocator locator;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 12c6e23..3559b5f 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
@@ -35,9 +35,6 @@ import org.junit.Test;
  */
 public abstract class MixupCompactorTestBase extends JournalImplTestBase {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
 
    private ReusableLatch startedCompactingLatch = null;
 
@@ -55,9 +52,6 @@ public abstract class MixupCompactorTestBase extends JournalImplTestBase {
 
    SimpleIDGenerator idGen = new SimpleIDGenerator(1000);
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
    @Override
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 494c2d6..04d90e6 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
@@ -43,9 +43,6 @@ import org.junit.Test;
  */
 public class MultiThreadConsumerStressTest extends ActiveMQTestBase {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
 
    final SimpleString ADDRESS = new SimpleString("SomeAddress");
 
@@ -167,9 +164,6 @@ public class MultiThreadConsumerStressTest extends ActiveMQTestBase {
       sf = createSessionFactory(locator);
    }
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 a1dc080..08af0fd 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
@@ -48,9 +48,6 @@ import org.junit.Test;
 
 public class NIOMultiThreadCompactorStressTest extends ActiveMQTestBase {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
 
    final SimpleString ADDRESS = new SimpleString("SomeAddress");
 
@@ -322,9 +319,7 @@ public class NIOMultiThreadCompactorStressTest extends ActiveMQTestBase {
       sess.close();
    }
 
-   // Static --------------------------------------------------------
 
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 ba63222..30c9604 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
@@ -43,9 +43,6 @@ public class MultipleConsumersPageStressTest extends ActiveMQTestBase {
 
    private static final Logger log = Logger.getLogger(MultipleConsumersPageStressTest.class);
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
 
    private static final int TIME_TO_RUN = 60 * 1000;
 
@@ -203,9 +200,6 @@ public class MultipleConsumersPageStressTest extends ActiveMQTestBase {
 
    }
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 ea79dd2..f811dc8 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
@@ -59,9 +59,7 @@ import org.junit.Test;
 
 public class PageCursorStressTest extends ActiveMQTestBase {
 
-   // Constants -----------------------------------------------------
 
-   // Attributes ----------------------------------------------------
 
    private final SimpleString ADDRESS = new SimpleString("test-add");
 
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 f81e9ed..c527ced 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
@@ -75,9 +75,6 @@ public class JMSBridgeImplTest extends ActiveMQTestBase {
 
    private static Logger log = Logger.getLogger(JMSBridgeImplTest.class);
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
 
    private static final String SOURCE = RandomUtil.randomString();
 
@@ -90,7 +87,6 @@ public class JMSBridgeImplTest extends ActiveMQTestBase {
    @Rule
    public ExpectedException thrown = ExpectedException.none();
 
-   // Static --------------------------------------------------------
 
    protected static TransactionManager newTransactionManager() {
       return new TransactionManager() {
@@ -183,7 +179,6 @@ public class JMSBridgeImplTest extends ActiveMQTestBase {
       };
    }
 
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
diff --git a/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/util/UUIDTest.java b/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/util/UUIDTest.java
index dc53f85..4d140ed 100644
--- a/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/util/UUIDTest.java
+++ b/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/util/UUIDTest.java
@@ -20,11 +20,6 @@ import org.apache.activemq.artemis.utils.UUIDGenerator;
 
 public class UUIDTest extends org.apache.activemq.artemis.tests.unit.util.UUIDTest {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
 
    public static void main(String[] args) {
       long start = System.currentTimeMillis();
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 a9a39c1..8d6419e 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
@@ -53,16 +53,9 @@ import org.junit.Test;
 
 public class LargeMessageBufferTest extends ActiveMQTestBase {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
 
    static int tmpFileCounter = 0;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
-
    // Public --------------------------------------------------------
 
    @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 39e55d1..298d23c 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
@@ -36,13 +36,6 @@ public class ConfigurationValidationTest extends ActiveMQTestBase {
       System.setProperty("ninetyTwoProp", "92");
    }
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 7b02089..99f9c0d 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
@@ -29,13 +29,6 @@ import org.junit.Test;
 
 public class TransportConfigurationTest extends ActiveMQTestBase {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 5975c38..49453c3 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
@@ -45,7 +45,7 @@ import org.junit.Test;
 
 public class AlignedJournalImplTest extends ActiveMQTestBase {
    private static final Logger log = Logger.getLogger(AlignedJournalImplTest.class);
-   // Constants -----------------------------------------------------
+
 
    private static final LoaderCallback dummyLoader = new LoaderCallback() {
 
@@ -72,7 +72,7 @@ public class AlignedJournalImplTest extends ActiveMQTestBase {
       }
    };
 
-   // Attributes ----------------------------------------------------
+
 
    private SequentialFileFactory factory;
 
@@ -84,9 +84,6 @@ public class AlignedJournalImplTest extends ActiveMQTestBase {
 
    private ArrayList<PreparedTransactionInfo> transactions = null;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 d1bc477..8246d4d 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
@@ -30,13 +30,6 @@ import org.junit.Test;
 
 public class CleanBufferTest extends ActiveMQTestBase {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 e0368f8..fbe843c 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
@@ -34,9 +34,6 @@ import org.junit.Test;
 
 public class JournalAsyncTest extends ActiveMQTestBase {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
 
    private FakeSequentialFileFactory factory;
 
@@ -46,9 +43,6 @@ public class JournalAsyncTest extends ActiveMQTestBase {
 
    private ArrayList<PreparedTransactionInfo> transactions = null;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 b65e4c1..66e6933 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
@@ -40,15 +40,10 @@ import org.junit.Test;
 
 public class TimedBufferTest extends ActiveMQTestBase {
    private static final Logger log = Logger.getLogger(TimedBufferTest.class);
-   // Constants -----------------------------------------------------
 
-   // Attributes ----------------------------------------------------
 
    private static final int ONE_SECOND_IN_NANOS = 1000000000; // in nanoseconds
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 42a0631..347c62e 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
@@ -24,16 +24,10 @@ import org.apache.activemq.artemis.core.journal.EncodingSupport;
  */
 public class SimpleEncoding implements EncodingSupport {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
    private final int size;
 
    private final byte bytetosend;
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    public SimpleEncoding(final int size, final byte bytetosend) {
       this.size = size;
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 755e41c..23b76a3 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
@@ -21,13 +21,6 @@ import org.junit.Test;
 
 public class PagePositionTest extends ActiveMQTestBase {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 bcf8808..9f2ffa4 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
@@ -48,13 +48,6 @@ import org.junit.Before;
 import org.junit.Test;
 
 public class PageTest extends ActiveMQTestBase {
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 76c8619..a61a55c 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
@@ -50,13 +50,7 @@ import org.junit.Before;
 import org.junit.Test;
 
 public class DuplicateDetectionUnitTest extends ActiveMQTestBase {
-   // Constants -----------------------------------------------------
 
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    ExecutorService executor;
 
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 57014b3..02cecbd 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
@@ -26,13 +26,6 @@ import org.junit.Before;
 import org.junit.Test;
 
 public abstract class ActiveMQBufferTestBase extends ActiveMQTestBase {
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 8a1183e..d19e16d 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
@@ -25,13 +25,6 @@ import org.apache.activemq.artemis.tests.unit.core.remoting.ActiveMQBufferTestBa
  */
 public class ChannelBufferWrapper2Test extends ActiveMQBufferTestBase {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 45d0aa0..7a874e3 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
@@ -76,13 +76,7 @@ public class SSLSupportTest extends ActiveMQTestBase {
 
    private String trustStorePassword;
 
-   // Constants -----------------------------------------------------
 
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 0e22146..33ecb2f 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
@@ -22,13 +22,7 @@ import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
 import org.junit.Test;
 
 public class SystemPropertyOverrideTest extends ActiveMQTestBase {
-   // Constants -----------------------------------------------------
 
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 dd4c41b..330bec7 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
@@ -32,13 +32,7 @@ import static org.apache.activemq.artemis.jms.client.ActiveMQDestination.QUEUE_Q
 import static org.apache.activemq.artemis.jms.client.ActiveMQDestination.TOPIC_QUALIFIED_PREFIX;
 
 public class ActiveMQDestinationTest extends ActiveMQTestBase {
-   // Constants -----------------------------------------------------
 
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 774ddab..f0a37ba 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
@@ -26,9 +26,7 @@ import org.junit.Before;
 import org.junit.Test;
 
 public class ActiveMQMapMessageTest extends ActiveMQTestBase {
-   // Constants -----------------------------------------------------
 
-   // Attributes ----------------------------------------------------
 
    private String itemName;
 
@@ -40,9 +38,6 @@ public class ActiveMQMapMessageTest extends ActiveMQTestBase {
       itemName = RandomUtil.randomString();
    }
 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 d13e287..253900d 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
@@ -27,13 +27,7 @@ import org.junit.Assert;
 import org.junit.Test;
 
 public class ActiveMQStreamMessageTest extends ActiveMQTestBase {
-   // Constants -----------------------------------------------------
 
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 079c78f..1cd0d39 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
@@ -34,13 +34,7 @@ import static org.apache.activemq.artemis.api.core.ActiveMQExceptionType.GENERIC
 import static org.apache.activemq.artemis.api.core.ActiveMQExceptionType.INVALID_FILTER_EXPRESSION;
 
 public class JMSExceptionHelperTest extends ActiveMQTestBase {
-   // Constants -----------------------------------------------------
 
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 61d816a..a4f858f 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
@@ -34,13 +34,7 @@ import org.junit.Test;
 public class ManifestTest extends ActiveMQTestBase {
 
    private static final Logger log = Logger.getLogger(ManifestTest.class);
-   // Constants -----------------------------------------------------
 
-   // Static --------------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 e382556..259201b 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
@@ -46,13 +46,6 @@ import org.junit.Test;
 
 public class ResourceAdapterTest extends ActiveMQTestBase {
 
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 fedcfd9..b98977f 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
@@ -27,13 +27,7 @@ import org.junit.Assert;
 import org.junit.Test;
 
 public class DestinationObjectFactoryTest extends ActiveMQTestBase {
-   // Constants -----------------------------------------------------
 
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 ad7751b..fec067a 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
@@ -41,13 +41,10 @@ import org.jboss.logging.Logger;
 public class InVMContext implements Context, Serializable {
 
    private static final Logger log = Logger.getLogger(InVMContext.class);
-   // Constants -----------------------------------------------------
 
-   private static final long serialVersionUID = 385743957345L;
 
-   // Static --------------------------------------------------------
+   private static final long serialVersionUID = 385743957345L;
 
-   // Attributes ----------------------------------------------------
 
    protected Map<String, Object> map;
 
@@ -55,7 +52,6 @@ public class InVMContext implements Context, Serializable {
 
    private String nameInNamespace = "";
 
-   // Constructors --------------------------------------------------
 
    public InVMContext() {
       map = Collections.synchronizedMap(new HashMap<String, Object>());
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 4b0bb07..bf41d35 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
@@ -24,11 +24,10 @@ import java.io.Serializable;
 import java.util.Properties;
 
 public class InVMNameParser implements NameParser, Serializable {
-   // Constants -----------------------------------------------------
 
    private static final long serialVersionUID = 2925203703371001031L;
 
-   // Static --------------------------------------------------------
+
 
    static Properties syntax;
 
@@ -39,9 +38,7 @@ public class InVMNameParser implements NameParser, Serializable {
       InVMNameParser.syntax.put("jndi.syntax.separator", "/");
    }
 
-   // Attributes ----------------------------------------------------
 
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 f1c7f4e..37a91c3 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
@@ -41,13 +41,10 @@ import org.jboss.logging.Logger;
 public class InVMNamingContext implements Context, Serializable {
 
    private static final Logger log = Logger.getLogger(InVMNamingContext.class);
-   // Constants -----------------------------------------------------
 
    private static final long serialVersionUID = 385743957345L;
 
-   // Static --------------------------------------------------------
 
-   // Attributes ----------------------------------------------------
 
    protected Map<String, Object> map;
 
@@ -55,7 +52,6 @@ public class InVMNamingContext implements Context, Serializable {
 
    private String nameInNamespace = "";
 
-   // Constructors --------------------------------------------------
 
    public InVMNamingContext() {
       map = Collections.synchronizedMap(new HashMap<String, Object>());
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 7171c24..8c62398 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
@@ -49,11 +49,7 @@ import org.junit.Test;
 
 public class ObjectInputStreamWithClassLoaderTest extends ActiveMQTestBase {
 
-   // Constants -----------------------------------------------------
 
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
 
    public static ClassLoader newClassLoader(final Class... userClasses) throws Exception {
 
@@ -85,8 +81,6 @@ public class ObjectInputStreamWithClassLoaderTest extends ActiveMQTestBase {
       return appClassLoader;
    }
 
-   // Constructors --------------------------------------------------
-
    // Public --------------------------------------------------------
 
    @Test
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 d18218e..96cd01d 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
@@ -23,13 +23,7 @@ import org.junit.Test;
 
 public class SoftValueMapTest extends ActiveMQTestBase {
    private static final Logger log = Logger.getLogger(SoftValueMapTest.class);
-   // Constants -----------------------------------------------------
 
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 1ffdfea..d18fe81 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
@@ -26,13 +26,7 @@ import java.util.Set;
 import java.util.UUID;
 
 public class UUIDGeneratorTest extends ActiveMQTestBase {
-   // Constants -----------------------------------------------------
 
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
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 1df3b7a..32b6370 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
@@ -26,13 +26,7 @@ import org.junit.Assert;
 import org.junit.Test;
 
 public class VersionLoaderTest extends ActiveMQTestBase {
-   // Constants -----------------------------------------------------
 
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------