Removed old finished TODOs and FIXMEs