Cleaning up some TODOs