Clean and update