Removing XML logic