Removed old FIXMEs

The problem has been fixed by pr #251
Fix #1001310
Merge pull request #270 from skyluc/issue/cleanup-todos-1001310

Removed old FIXMEs