Review, remove, and add some TODOs