Removed old TODOs and FIXMEs