More fermentation steps cleanup