Cleanup FIXMEs (#3488)
Merge pull request #4706 from sanxiyn/cleanup-fixme

Cleanup FIXMEs (#3488)