driver.c - cleanups