Cleanup
Upgrade XStream