Revert "Removed some useless TODO's"

This reverts commit d97f8428acb145522711bc4665062772d5015b3c.