(driver.c) Cleanups