- remove refs to xdata and change to drat refs