Remove TODO

TODO items finished.