Some cleanup before presentation