Ongoing cleanup.