Tidying up some TODOs