INT-3278 Polishing

* PR Comments
* Remove the listener when the bean is destroy()ed.