tidy up and start with new setup