Removed Q. Used native Promise instead of Q