Cleaning up minor TODOs