Remove a couple of TODOs