MYLOC-59 - Cleaning up event handling