Removed old XML bits