Revert "clean up TODO"

This reverts commit e07c867c543fe5a09adc515e7a21aae9fe39d16a.