removed some FIXMEs