add FIXME and remove redundant comments