Remove cruft and update TODOs