Ticket #132 - removing useless event listener