remove q ref
move to bluebird promises