Final clean-up steps.