Removed Q dependency
Removed underscore dep + ref. to Q and underscore