Upgrade versions, remove unused imports.

Update to spring 4.0.