Cleanup with loggers in XDS