Revert "Add class for xml access"

This reverts commit 96daacc5db97dede36d7f9face3c0eed6b68669e.