remove some FIXME that was already addressed.