Cosmetic msvc xml fix and remove dead code.