Update version and cleanup