Some cleanup before the big show