Additional light cleanup work in tours