Tidy up and stop recreating the entire system.