Removal of a few TODOs. I think.