diff --git a/src/kademlia/Kademlia.java b/src/kademlia/Kademlia.java
index 1536564..4174f13 100644
--- a/src/kademlia/Kademlia.java
+++ b/src/kademlia/Kademlia.java
@@ -43,10 +43,6 @@ import kademlia.util.serializer.JsonSerializer;
  * @todo When we receive a store message - if we have a newer version of the content, re-send this newer version to that node so as to update their version
  * @todo Handle IPv6 Addresses
  * @todo Handle compressing data
- * @todo Allow optional storing of content locally using the put method
- * @todo Instead of using a StoreContentMessage to send a store RPC and a ContentMessage to receive a FIND rpc, make them 1 message with different operation type
- * @todo If we're trying to send a message to this node, just cancel the sending process and handle the message right here
- * @todo Keep this node in it's own routing table - it helps for ContentRefresh operation - easy to check whether this node is one of the k-nodes for a content
  * @todo Implement Kademlia.ping() operation.
  *
  */
diff --git a/src/kademlia/dht/StoredContentManager.java b/src/kademlia/dht/StoredContentManager.java
index 8a0911d..3d541a5 100644
--- a/src/kademlia/dht/StoredContentManager.java
+++ b/src/kademlia/dht/StoredContentManager.java
@@ -65,8 +65,6 @@ class StoredContentManager
     /**
      * Checks if our DHT has a Content for the given criteria
      *
-     * @todo Add searching for content by type and ownerID
-     *
      * @param param The parameters used to search for a content
      *
      * @return boolean
@@ -113,8 +111,6 @@ class StoredContentManager
      *
      * @param param The parameters used to search for a content
      *
-     * @todo Add finding for content by type and ownerID
-     *
      * @return List of content for the specific search parameters
      */
     public StorageEntryMetadata get(GetParameter param) throws NoSuchElementException
diff --git a/src/kademlia/operation/ConnectOperation.java b/src/kademlia/operation/ConnectOperation.java
index c8b5057..9e65b24 100644
--- a/src/kademlia/operation/ConnectOperation.java
+++ b/src/kademlia/operation/ConnectOperation.java
@@ -81,10 +81,11 @@ public class ConnectOperation implements Operation, Receiver
             lookup.execute();
 
             /**
-             * @todo Refresh buckets to get a good routing table
-             * I think after the above lookup operation, K buckets will be filled
-             * Not sure if this operation is needed here
+             * Refresh buckets to get a good routing table
+             * After the above lookup operation, K nodes will be in our routing table,
+             * Now we try to populate all of our buckets.
              */
+            new BucketRefreshOperation(this.server, this.localNode, this.config).execute();
         }
         catch (IOException | InterruptedException e)
         {