diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AsyncConsistentSetMultimap.java b/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AsyncConsistentSetMultimap.java
index 45b4d56..6d3c5b7 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AsyncConsistentSetMultimap.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AsyncConsistentSetMultimap.java
@@ -158,7 +158,6 @@
 
     @Override
     public CompletableFuture<Map<String, Collection<byte[]>>> asMap() {
-        //TODO
         throw new UnsupportedOperationException("Expensive operation.");
     }
 
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AsyncConsistentSetMultimapState.java b/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AsyncConsistentSetMultimapState.java
index 878aac24..5fd9189 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AsyncConsistentSetMultimapState.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AsyncConsistentSetMultimapState.java
@@ -476,11 +476,6 @@
                 });
                 if (valuesToAdd.isEmpty()) {
                     //Do not increment or add the commit if no change resulted
-//                    TODO fairly sure the below case is unreachable but
-//                    TODO need to make sure
-//                    if (valueCountdownMap.isEmpty()) {
-//                        backingMap.remove(((Put) commit.operation()).key());
-//                    }
                     commit.close();
                     return null;
                 }