remove XXX and replace with FIXME