Remove outdated FIXME comments