some cleanups to the driver programs