Removed convoluted event listener