Properly remove listeners