     for ev in event
       target.addEventListener ev, listener, false
 
-removeHandler = (element, event, selector) ->
+removeHandler = (element, event, listener, selector) ->
   target = getTarget element, selector
-  ###
   if target?
-    listeners = getEventListeners target
     unless event instanceof Array
       event = [event]
     for ev in event
-      for listener in listeners[ev]
-        target.removeEventListener ev, listener, false
-  ###
+      target.removeEventListener ev, listener, false
 
 hasClassList = (element, selector) ->
   target = getTarget element, selector


    @_hideLess() if @length is 1

    addHandler window, 'resize', =>
      image = @images[@current]
      @updateDimensions image.width, image.height

    @open cid
    @

      addHandler thumbnail, 'click', -> _this.open toInt @getAttribute 'data-cid'
      setStyle thumbnail, "background-image": "url(#{image})"

    addHandler @overlay, 'click', @_toggleThumbnails, '.choco-thumbnails-toggle'

    if isStorage and not hasClass @thumbnails, 'choco-hide'
      status = localStorage.getItem('choco-thumbnails') or 1
