Clean-up after setup