Final clean-up