- more cleanup of xdata refs