Removed old TODOs