Cleaning and update