cleanup FIXMEs