XML cleanups