End clean-up