Refined clean-and-update.