Swaping teardown with teardown from disk/memory
Merge pull request #127 from nrmitchi/master

Fix teardown. Closes #2332