Remove solved FIXME