More garbage collection.
Merge pull request #46 from ktf/more-garbage-collection

More garbage collection.