Fixed memory leak, potential hang, and unnecessary work.

Note: we don't need the object name!