Some cleanup before continuing