Update with cleanup