diff --git a/src/lib/template/dom-if.html b/src/lib/template/dom-if.html
index 31b68cfbdc..89a39c0a10 100644
--- a/src/lib/template/dom-if.html
+++ b/src/lib/template/dom-if.html
@@ -73,7 +73,6 @@
     },
 
     detached: function() {
-      // TODO(kschaaf): add logic to re-stamp in attached?
       if (!this.parentNode) {
         this._teardownInstance();
       }
@@ -81,7 +80,7 @@
 
     attached: function() {
       if (this.if && this.ctor) {
-        // TODO(sorvell): should not be async, but node can be attached
+        // NOTE: ideally should not be async, but node can be attached
         // when shady dom is in the act of distributing/composing so push it out
         this.async(this._ensureInstance);
       }
@@ -123,10 +122,8 @@
       if (parentNode) {
         var parent = Polymer.dom(parentNode);
         if (!this._instance) {
-          // TODO(sorvell): pickup stamping logic from x-repeat
           this._instance = this.stamp();
           var root = this._instance.root;
-          // TODO(sorvell): this incantation needs to be simpler.
           parent.insertBefore(root, this);
         } else {
           var c$ = this._instance._children;