Removed even more unused FIXMEs