Remove some boilerplate and upgrade the jClouds version.