Removed unnecessary click listeners