diff --git a/broker/src/main/java/org/eclipse/moquette/spi/impl/subscriptions/SubscriptionsStore.java b/broker/src/main/java/org/eclipse/moquette/spi/impl/subscriptions/SubscriptionsStore.java
index 404bd289..fc8bfafd 100644
--- a/broker/src/main/java/org/eclipse/moquette/spi/impl/subscriptions/SubscriptionsStore.java
+++ b/broker/src/main/java/org/eclipse/moquette/spi/impl/subscriptions/SubscriptionsStore.java
@@ -127,7 +127,6 @@ public class SubscriptionsStore {
         }
     }
 
-    //TODO modify the data structure
     protected void addDirect(Subscription newSubscription) {
         TreeNode oldRoot;
         NodeCouple couple;
diff --git a/broker/src/main/java/org/eclipse/moquette/spi/impl/subscriptions/TreeNode.java b/broker/src/main/java/org/eclipse/moquette/spi/impl/subscriptions/TreeNode.java
index 58dca1ed..46ea1683 100644
--- a/broker/src/main/java/org/eclipse/moquette/spi/impl/subscriptions/TreeNode.java
+++ b/broker/src/main/java/org/eclipse/moquette/spi/impl/subscriptions/TreeNode.java
@@ -64,10 +64,6 @@ class TreeNode {
     void addChild(TreeNode child) {
         m_children.add(child);
     }
-//
-//    boolean isLeaf() {
-//        return m_children.isEmpty();
-//    }
 
     /**
      * Creates a shallow copy of the current node.