Refactored async resolver code flow

Dead code?