Remove deprecated use of concurrent.promise

Now only concurrent.Promise is supposed to be used.

We aren't doing imports consistently but tried to match
each individual file. Some future commit can sync
the style across files.