Removing FIXMEs that were fixed