Big cleaning and rework