Remove some TODO
A bit