Updated: Removed orphan XmlRenderer.