Add a few more lines of cleanup.