Clean up some TODOs