           KiteCache.unset query
 
           kiteInstance = @kites[kiteName]?['singleton'] or {}
-          {waitingCalls, waitingPromises} = kiteInstance
-
-          console.log "# WAITING CALLS for #{kiteName}", waitingCalls, waitingPromises
+          {waitingPromises} = kiteInstance
 
           delete @kites[kiteName]['singleton']
 
           if machine = computeController.findMachineFromQueryString queryString
             delete @kites[kiteName][machine.uid]
 
-          (@getKite { name: kiteName, queryString, waitingCalls })?.connect()
+          (@getKite { name: kiteName, queryString, waitingPromises })?.connect()
 
     return kite
 

  getKite: (options = {}) ->

    # Get options
    { name, correlationName, region, transportOptions, waitingCalls
      username, environment, version, queryString } = options

    # If no `correlationName` is defined assume this kite instance

          KodingKontrol.dcNotification?.destroy()
          KodingKontrol.dcNotification = null

    if waitingPromises? and waitingPromises.length > 0

      console.log "THERE WERE WAITING PROMISES FOR THIS KITE:", waitingPromises

      kite.once 'connected', ->
        console.log "RESOLVING WAITING PROMISES...", waitingPromises
        for promise in waitingPromises
          [resolve, args] = promise
          resolve kite.transport?.tell args...

    # Query kontrol
    @fetchKite
