Tidy up some TODOs