Clean up some stray lines and put back DoQuit