diff --git a/broker/src/main/java/io/moquette/server/netty/NettyUtils.java b/broker/src/main/java/io/moquette/server/netty/NettyUtils.java
index 91e64772..64553fe1 100644
--- a/broker/src/main/java/io/moquette/server/netty/NettyUtils.java
+++ b/broker/src/main/java/io/moquette/server/netty/NettyUtils.java
@@ -37,8 +37,6 @@ public class NettyUtils {
     private static final AttributeKey<Object> ATTR_KEY_CLEANSESSION = AttributeKey.valueOf(Constants.CLEAN_SESSION);
     private static final AttributeKey<Object> ATTR_KEY_CLIENTID = AttributeKey.valueOf(Constants.ATTR_CLIENTID);
     private static final AttributeKey<Object> ATTR_KEY_USERNAME = AttributeKey.valueOf(ATTR_USERNAME);
-    private static final AttributeKey<Object> ATTR_KEY_SESSION_STOLEN = AttributeKey.valueOf(ATTR_SESSION_STOLEN);
-    private static final AttributeKey<Object> ATTR_KEY_CHANNEL_STATUS = AttributeKey.valueOf(ATTR_CHANNEL_STATUS);
 
     public static Object getAttribute(ChannelHandlerContext ctx, AttributeKey<Object> key) {
         Attribute<Object> attr = ctx.channel().attr(key);
@@ -72,14 +70,4 @@ public class NettyUtils {
     public static String userName(Channel channel) {
         return (String) channel.attr(NettyUtils.ATTR_KEY_USERNAME).get();
     }
-
-    /*@Deprecated
-    public static void sessionStolen(Channel channel, boolean value) {
-        channel.attr(NettyUtils.ATTR_KEY_SESSION_STOLEN).set(value);
-    }
-
-    @Deprecated
-    public static Boolean sessionStolen(Channel channel) {
-        return (Boolean) channel.attr(NettyUtils.ATTR_KEY_SESSION_STOLEN).get();
-    }*/
 }
diff --git a/tools_scripts/benchmark/paho_benchmaker/benchmarker.groovy b/tools_scripts/benchmark/paho_benchmaker/benchmarker.groovy
index 79f7ac13..adcd4329 100644
--- a/tools_scripts/benchmark/paho_benchmaker/benchmarker.groovy
+++ b/tools_scripts/benchmark/paho_benchmaker/benchmarker.groovy
@@ -26,20 +26,6 @@ String dialog_id = args.size() > 3 ? args[3] : ""
 String tmpDir = System.getProperty("java.io.tmpdir")
 MqttDefaultFilePersistence dataStore = new MqttDefaultFilePersistence(tmpDir)
 MqttAsyncClient pub = new MqttAsyncClient("tcp://${host}:1883", "PublisherClient${dialog_id}", dataStore)
-//MqttConnectOptions pubConnOptions = new MqttConnectOptions()
-//pubConnOptions.cleanSession = true
-//pub.connect(pubConnOptions).waitForCompletion(1000)
-
-//MQTT pub = new MQTT()
-//pub.setHost(host, 1883)
-//pub.setCleanSession(true)
-//pub.setClientId("PublisherClient${dialog_id}")
-//
-//MQTT sub = new MQTT()
-////mqtt.setHost("test.mosquitto.org", 1883);
-//sub.setHost(host, 1883)
-//sub.setCleanSession(true)
-//sub.setClientId("SubscriberClient${dialog_id}")
 
 MqttDefaultFilePersistence dataStoreSub = new MqttDefaultFilePersistence(tmpDir)
 MqttAsyncClient sub = new MqttAsyncClient("tcp://${host}:1883", "SubscriberClient${dialog_id}", dataStoreSub)