Removed FIXMEs