Update to new version and cleanup