Removed some fixed TODOs.