Remove old FIXME-s