Replaced When.js with RSVP