some additions around cleaning race times.