Remove TODOs

We'll do this in a later branch.