Remove XStream
Interim heckin