Minimal clean-up