Removed all old XML code