Cleaning up some old TODOs that I've finished