Getting rid of TODOs

It will close existing quality bugs.