Closes #442: Remove seemingly useless code in order to allow more than o...

...ne listener per event