Revert "updated TODOs"

This reverts commit 5421a37e8ed9b728ab12c6dbdecc278e7d50ca87.
basically, the changes I made earlier were bad