Replace node-promise with Q