remove old FIXME
Merge pull request #1669 from pitr-ch/tdd/remove_old_fixme

TDD remove old FIXME