removing some FIXME.