Revert "Add TODO"

This reverts commit 0d8ee250ac539a166673106224d2bfdcf878daf4.