Cleanup TODOs and FIXMEs