Get rid of unneccesary event listener