Tiny commit, added cleanup for Listener