Remove irrelevant FIXME