Some updates to support a cleanup operation.