Cleaned out old TODOs and updated new ones.