Cleaned up rest of the xml files