Finish clean-up