Handle Challenge improvements

* Skip challenges if there is not a queued payload
* Remove queued payload after use