Replaced Q and async with Bluebird