Removed solved FIXMEs