cleanup

* removed old TODO
* removed uneeded debug