Harvester / CSW / cleaning (related to #1259).