Driver cleanup should be in same CL as app.