Cleanup listeners
Merge pull request #839 from spumko/memory

Cleanup listeners