More cleaning and some support replacements