Cleanup some TODOs