diff --git a/acl/src/main/java/org/apache/rocketmq/acl/plain/PlainPermissionLoader.java b/acl/src/main/java/org/apache/rocketmq/acl/plain/PlainPermissionLoader.java
index 9c36ecf71f3c84e8f6202a14212b85a8d1696b05..7f0e67a56c853bd149ae5953d480849657200170 100644
--- a/acl/src/main/java/org/apache/rocketmq/acl/plain/PlainPermissionLoader.java
+++ b/acl/src/main/java/org/apache/rocketmq/acl/plain/PlainPermissionLoader.java
@@ -43,7 +43,7 @@ import org.apache.rocketmq.logging.InternalLoggerFactory;
 
 public class PlainPermissionLoader {
 
-    private static final InternalLogger log = InternalLoggerFactory.getLogger(LoggerName.ACL_PLUG_LOGGER_NAME);
+    private static final InternalLogger log = InternalLoggerFactory.getLogger(LoggerName.BROKER_LOGGER_NAME);
 
     private static final String DEFAULT_PLAIN_ACL_FILE = "/conf/plain_acl.yml";
 
diff --git a/acl/src/main/java/org/apache/rocketmq/acl/plain/RemoteAddressStrategyFactory.java b/acl/src/main/java/org/apache/rocketmq/acl/plain/RemoteAddressStrategyFactory.java
index 10b4734588ff62d863e88ca0956148ed594805da..4f1dc055d03cf8eefc5e63c18bedc086e97eda38 100644
--- a/acl/src/main/java/org/apache/rocketmq/acl/plain/RemoteAddressStrategyFactory.java
+++ b/acl/src/main/java/org/apache/rocketmq/acl/plain/RemoteAddressStrategyFactory.java
@@ -27,7 +27,7 @@ import org.apache.rocketmq.logging.InternalLoggerFactory;
 
 public class RemoteAddressStrategyFactory {
 
-    private static final InternalLogger log = InternalLoggerFactory.getLogger(LoggerName.ACL_PLUG_LOGGER_NAME);
+    private static final InternalLogger log = InternalLoggerFactory.getLogger(LoggerName.BROKER_LOGGER_NAME);
 
     public static final NullRemoteAddressStrategy NULL_NET_ADDRESS_STRATEGY = new NullRemoteAddressStrategy();
 
diff --git a/broker/src/main/java/org/apache/rocketmq/broker/processor/AdminBrokerProcessor.java b/broker/src/main/java/org/apache/rocketmq/broker/processor/AdminBrokerProcessor.java
index 9771ec9a9e099fafc67667d57f869d743ec1b115..73fe43942709136ec2d94c879feb66b9a0e23286 100644
--- a/broker/src/main/java/org/apache/rocketmq/broker/processor/AdminBrokerProcessor.java
+++ b/broker/src/main/java/org/apache/rocketmq/broker/processor/AdminBrokerProcessor.java
@@ -228,14 +228,6 @@ public class AdminBrokerProcessor implements NettyRequestProcessor {
             return response;
         }
 
-        if (this.brokerController.getBrokerConfig().isAutoTraceBrokerEnable()) {
-            String errorMsg = "the topic[" + requestHeader.getTopic() + "] is user self defined topic and this node is trace broker!";
-            log.warn(errorMsg);
-            response.setCode(ResponseCode.SYSTEM_ERROR);
-            response.setRemark(errorMsg);
-            return response;
-        }
-
         try {
             response.setCode(ResponseCode.SUCCESS);
             response.setOpaque(request.getOpaque());
diff --git a/broker/src/main/java/org/apache/rocketmq/broker/topic/TopicConfigManager.java b/broker/src/main/java/org/apache/rocketmq/broker/topic/TopicConfigManager.java
index f1ae2612aa02c52452c0dc6c1a7447b9d69ebceb..6a97c1c7fd06f9d6e45f2dd90b824cade39d24c8 100644
--- a/broker/src/main/java/org/apache/rocketmq/broker/topic/TopicConfigManager.java
+++ b/broker/src/main/java/org/apache/rocketmq/broker/topic/TopicConfigManager.java
@@ -125,14 +125,12 @@ public class TopicConfigManager extends ConfigManager {
             this.topicConfigTable.put(topicConfig.getTopicName(), topicConfig);
         }
         {
-            if (this.brokerController.getBrokerConfig().isAutoTraceBrokerEnable()) {
-                String topic = this.brokerController.getBrokerConfig().getMsgTraceTopicName();
-                TopicConfig topicConfig = new TopicConfig(topic);
-                this.systemTopicList.add(topic);
-                topicConfig.setReadQueueNums(1);
-                topicConfig.setWriteQueueNums(1);
-                this.topicConfigTable.put(topicConfig.getTopicName(), topicConfig);
-            }
+            String topic = this.brokerController.getBrokerConfig().getMsgTraceTopicName();
+            TopicConfig topicConfig = new TopicConfig(topic);
+            this.systemTopicList.add(topic);
+            topicConfig.setReadQueueNums(1);
+            topicConfig.setWriteQueueNums(1);
+            this.topicConfigTable.put(topicConfig.getTopicName(), topicConfig);
         }
     }
 
@@ -164,10 +162,6 @@ public class TopicConfigManager extends ConfigManager {
                     if (topicConfig != null)
                         return topicConfig;
 
-                    if (this.brokerController.getBrokerConfig().isAutoTraceBrokerEnable()) {
-                        return topicConfig;
-                    }
-
                     TopicConfig defaultTopicConfig = this.topicConfigTable.get(defaultTopic);
                     if (defaultTopicConfig != null) {
                         if (defaultTopic.equals(MixAll.AUTO_CREATE_TOPIC_KEY_TOPIC)) {
diff --git a/client/src/main/java/org/apache/rocketmq/client/consumer/DefaultMQPushConsumer.java b/client/src/main/java/org/apache/rocketmq/client/consumer/DefaultMQPushConsumer.java
index edb8cb5abf21db84105ec8693173f6f2d965ef40..d13a16a26f354856893cb1a32bb2ed50a9713f98 100644
--- a/client/src/main/java/org/apache/rocketmq/client/consumer/DefaultMQPushConsumer.java
+++ b/client/src/main/java/org/apache/rocketmq/client/consumer/DefaultMQPushConsumer.java
@@ -758,8 +758,4 @@ public class DefaultMQPushConsumer extends ClientConfig implements MQPushConsume
     public TraceDispatcher getTraceDispatcher() {
         return traceDispatcher;
     }
-
-    public void setTraceDispatcher(TraceDispatcher traceDispatcher) {
-        this.traceDispatcher = traceDispatcher;
-    }
 }
diff --git a/client/src/main/java/org/apache/rocketmq/client/producer/DefaultMQProducer.java b/client/src/main/java/org/apache/rocketmq/client/producer/DefaultMQProducer.java
index 23cb53ca1f001b55ff33e72baad56f15b28a5f9e..adfac3cd238ce55b0f031ff18ac92f3f27bd000e 100644
--- a/client/src/main/java/org/apache/rocketmq/client/producer/DefaultMQProducer.java
+++ b/client/src/main/java/org/apache/rocketmq/client/producer/DefaultMQProducer.java
@@ -850,7 +850,4 @@ public class DefaultMQProducer extends ClientConfig implements MQProducer {
         return traceDispatcher;
     }
 
-    public void setTraceDispatcher(TraceDispatcher traceDispatcher) {
-        this.traceDispatcher = traceDispatcher;
-    }
 }
diff --git a/common/src/main/java/org/apache/rocketmq/common/BrokerConfig.java b/common/src/main/java/org/apache/rocketmq/common/BrokerConfig.java
index eb1a684dfc19086b8e6d8a93f507f13eb4936e84..f9d403ec5b6bcf1f5e883255d84a947aaa246895 100644
--- a/common/src/main/java/org/apache/rocketmq/common/BrokerConfig.java
+++ b/common/src/main/java/org/apache/rocketmq/common/BrokerConfig.java
@@ -52,8 +52,6 @@ public class BrokerConfig {
     private boolean autoCreateSubscriptionGroup = true;
     private String messageStorePlugIn = "";
     @ImportantField
-    private boolean autoTraceBrokerEnable = false;
-    @ImportantField
     private String msgTraceTopicName = MixAll.RMQ_SYS_TRACE_TOPIC;
     /**
      * thread numbers for send message thread pool, since spin lock will be used by default since 4.0.x, the default
@@ -751,14 +749,6 @@ public class BrokerConfig {
         this.waitTimeMillsInTransactionQueue = waitTimeMillsInTransactionQueue;
     }
 
-    public boolean isAutoTraceBrokerEnable() {
-        return autoTraceBrokerEnable;
-    }
-
-    public void setAutoTraceBrokerEnable(boolean autoTraceBrokerEnable) {
-        this.autoTraceBrokerEnable = autoTraceBrokerEnable;
-    }
-
     public String getMsgTraceTopicName() {
         return msgTraceTopicName;
     }
diff --git a/common/src/main/java/org/apache/rocketmq/common/MixAll.java b/common/src/main/java/org/apache/rocketmq/common/MixAll.java
index 5fdb0120f45c77184e4853b59eac12ec08bcc792..d39e63386f6b038a2cbc3451df401d85c0698b30 100644
--- a/common/src/main/java/org/apache/rocketmq/common/MixAll.java
+++ b/common/src/main/java/org/apache/rocketmq/common/MixAll.java
@@ -82,8 +82,7 @@ public class MixAll {
     public static final long CURRENT_JVM_PID = getPID();
 
     public static final String RETRY_GROUP_TOPIC_PREFIX = "%RETRY%";
-    public static final String TRACE_BROKER_NAME_SUFFIX = "trace";
-    
+
     public static final String DLQ_GROUP_TOPIC_PREFIX = "%DLQ%";
     public static final String SYSTEM_TOPIC_PREFIX = "rmq_sys_";
     public static final String UNIQUE_MSG_QUERY_FLAG = "_UNIQUE_KEY_QUERY";
diff --git a/common/src/main/java/org/apache/rocketmq/common/constant/LoggerName.java b/common/src/main/java/org/apache/rocketmq/common/constant/LoggerName.java
index a463a4ed7c1285983247b970762afee46733fba5..fe0ae9f17137fd22a13f80d18cfddd0497b0601a 100644
--- a/common/src/main/java/org/apache/rocketmq/common/constant/LoggerName.java
+++ b/common/src/main/java/org/apache/rocketmq/common/constant/LoggerName.java
@@ -37,5 +37,4 @@ public class LoggerName {
     public static final String PROTECTION_LOGGER_NAME = "RocketmqProtection";
     public static final String WATER_MARK_LOGGER_NAME = "RocketmqWaterMark";
     public static final String FILTER_LOGGER_NAME = "RocketmqFilter";
-    public static final String ACL_PLUG_LOGGER_NAME = "RocketmqAclPlug";
 }
diff --git a/common/src/test/java/org/apache/rocketmq/common/BrokerConfigTest.java b/common/src/test/java/org/apache/rocketmq/common/BrokerConfigTest.java
index 7e197522f30d05ee58bb6e0f6b5aea5a2751f1c3..aa8bcfa7252657954fd31119baee23ab713ed531 100644
--- a/common/src/test/java/org/apache/rocketmq/common/BrokerConfigTest.java
+++ b/common/src/test/java/org/apache/rocketmq/common/BrokerConfigTest.java
@@ -33,7 +33,6 @@ public class BrokerConfigTest {
         BrokerConfig brokerConfig = new BrokerConfig();
         brokerConfig.setNamesrvAddr("127.0.0.1:9876");
         brokerConfig.setAutoCreateTopicEnable(false);
-        brokerConfig.setAutoTraceBrokerEnable(true);
         brokerConfig.setBrokerName("broker-a");
         brokerConfig.setBrokerId(0);
         brokerConfig.setBrokerClusterName("DefaultCluster");
@@ -44,7 +43,5 @@ public class BrokerConfigTest {
         assertThat(brokerConfig.getBrokerId()).isEqualTo(0);
         assertThat(brokerConfig.getBrokerName()).isEqualTo("broker-a");
         assertThat(brokerConfig.isAutoCreateTopicEnable()).isEqualTo(false);
-        assertThat(brokerConfig.isAutoTraceBrokerEnable()).isEqualTo(true);
-
     }
 }
\ No newline at end of file
diff --git a/distribution/conf/2m-noslave/broker-a.properties b/distribution/conf/2m-noslave/broker-a.properties
index cd051cdc138f52a8101d526f255c105be67330eb..b704b54c54c72349238ec0f00bea1f5b4c9b7d20 100644
--- a/distribution/conf/2m-noslave/broker-a.properties
+++ b/distribution/conf/2m-noslave/broker-a.properties
@@ -19,4 +19,3 @@ deleteWhen=04
 fileReservedTime=48
 brokerRole=ASYNC_MASTER
 flushDiskType=ASYNC_FLUSH
-autoTraceBrokerEnable=false
\ No newline at end of file
diff --git a/distribution/conf/2m-noslave/broker-b.properties b/distribution/conf/2m-noslave/broker-b.properties
index da00cd41901979af75fb1faaf9a0a362b1574783..130671a7c319eaf8d3b98e62845bedbb3296a291 100644
--- a/distribution/conf/2m-noslave/broker-b.properties
+++ b/distribution/conf/2m-noslave/broker-b.properties
@@ -19,4 +19,3 @@ deleteWhen=04
 fileReservedTime=48
 brokerRole=ASYNC_MASTER
 flushDiskType=ASYNC_FLUSH
-autoTraceBrokerEnable=false
\ No newline at end of file
diff --git a/distribution/conf/2m-noslave/broker-trace.properties b/distribution/conf/2m-noslave/broker-trace.properties
index a4898aae0c1e4b6b2e3e5648bc33aa4f4c3ec3f8..9dd57a73def1b3de90e201ddf26da55de7663f9e 100644
--- a/distribution/conf/2m-noslave/broker-trace.properties
+++ b/distribution/conf/2m-noslave/broker-trace.properties
@@ -21,4 +21,3 @@ deleteWhen=04
 fileReservedTime=48
 brokerRole=ASYNC_MASTER
 flushDiskType=ASYNC_FLUSH
-autoTraceBrokerEnable=true
\ No newline at end of file
diff --git a/distribution/conf/broker.conf b/distribution/conf/broker.conf
index 970395735d7d9a68b796c72dc92c9acfbf40ffae..0c0b28b7b8e7ba65d886b1a9395ba8b0e09cb52b 100644
--- a/distribution/conf/broker.conf
+++ b/distribution/conf/broker.conf
@@ -20,5 +20,3 @@ deleteWhen = 04
 fileReservedTime = 48
 brokerRole = ASYNC_MASTER
 flushDiskType = ASYNC_FLUSH
-enableAcl=true
-namesrvAddr=127.0.0.1:9876
diff --git a/srvutil/src/main/java/org/apache/rocketmq/srvutil/ServerUtil.java b/srvutil/src/main/java/org/apache/rocketmq/srvutil/ServerUtil.java
index ea8047a2ff12f077e59797587e7da6b9c79c949b..066d36cedd981390ea816e6661b2ddc489168024 100644
--- a/srvutil/src/main/java/org/apache/rocketmq/srvutil/ServerUtil.java
+++ b/srvutil/src/main/java/org/apache/rocketmq/srvutil/ServerUtil.java
@@ -35,8 +35,8 @@ public class ServerUtil {
             new Option("n", "namesrvAddr", true,
                 "Name server address list, eg: 192.168.0.1:9876;192.168.0.2:9876");
         opt.setRequired(false);
-        options.addOption(opt);       
-        
+        options.addOption(opt);
+
         return options;
     }
 
diff --git a/test/src/test/java/org/apache/rocketmq/test/base/BaseConf.java b/test/src/test/java/org/apache/rocketmq/test/base/BaseConf.java
index a05a55a06b342b468ff4fad284840cbf44101ed0..780bd47506d254c0366bcaeb77ef489013a25742 100644
--- a/test/src/test/java/org/apache/rocketmq/test/base/BaseConf.java
+++ b/test/src/test/java/org/apache/rocketmq/test/base/BaseConf.java
@@ -24,7 +24,6 @@ import org.apache.log4j.Logger;
 import org.apache.rocketmq.broker.BrokerController;
 import org.apache.rocketmq.common.MQVersion;
 import org.apache.rocketmq.namesrv.NamesrvController;
-import org.apache.rocketmq.remoting.netty.TlsSystemConfig;
 import org.apache.rocketmq.remoting.protocol.RemotingCommand;
 import org.apache.rocketmq.test.client.rmq.RMQAsyncSendProducer;
 import org.apache.rocketmq.test.client.rmq.RMQNormalConsumer;
diff --git a/tools/src/main/java/org/apache/rocketmq/tools/command/MQAdminStartup.java b/tools/src/main/java/org/apache/rocketmq/tools/command/MQAdminStartup.java
index 065e4175df7920a6973bf1442af899431a2d325a..989f8d7716de829b42f9a1f070764a5fbe3ee975 100644
--- a/tools/src/main/java/org/apache/rocketmq/tools/command/MQAdminStartup.java
+++ b/tools/src/main/java/org/apache/rocketmq/tools/command/MQAdminStartup.java
@@ -132,7 +132,7 @@ public class MQAdminStartup {
                             System.setProperty(MixAll.NAMESRV_ADDR_PROPERTY, namesrvAddr);
                         }
 
-                        cmd.execute(commandLine, options, getAclRPCHook(commandLine));
+                        cmd.execute(commandLine, options, getAclRPCHook());
                     } else {
                         System.out.printf("The sub command %s not exist.%n", args[0]);
                     }
@@ -246,7 +246,7 @@ public class MQAdminStartup {
         subCommandList.add(command);
     }
 
-    public static RPCHook getAclRPCHook(CommandLine commandLine) {
+    public static RPCHook getAclRPCHook() {
         String fileHome = System.getProperty(MixAll.ROCKETMQ_HOME_PROPERTY, System.getenv(MixAll.ROCKETMQ_HOME_ENV));
         String fileName = "/conf/tools.yml";
         JSONObject yamlDataObject = AclUtils.getYamlDataObject(fileHome + fileName ,