Removed wasteful event handling