Gets rid of some TODOs