Remove some fixed TODOs