Removed fixed TODO
TODO cleanup