More harvester cleanup