Remove no longer relevant FIXMEs