Clean up the teardown logic to make it more robust and to record the additions and

invocations of them into session object.

Remove a debug statement.

llvm-svn: 116938