Gentle clean-up