More XML Cleanup