Remove unnecessary click events
More events, fewer click handlers