upgraded spring and SI versions, clean up