Commented out unused event listeners