Add new setup, remove the session driver.