Cleaning up the setup