Removed TODOs

Unlikely that we'll get there.