Remove a few more TODOs