Got rid of some TODOs