Removed out-of-date TODOs