Remove unused listener
Merge branch 'hotfix/module-event-listener'

Removed unused event listener