Removed TODOs
Revert "Removed TODOs"

This reverts commit 90ef7d8422dbf8326d25d7ed6536ee9bf18f7af9.
Another change