Removed the extra function reference passed to the done callback
Looping is possible by other means and this change simplifies the upcoming promise support
Extra api support checking