Added TODO comment for work needed to remove event listeners