Cleanup of syntax in xml files