Pre-presentation cleanup