Removed unneeded event listeners