Fixed: Removed silly event handler