Getting rid of some XDATA references from style guide