XML optimizations
removed / changed debug outputs