Necessary clean-up