Removed more XIO stuff