JCLOUDS-40 clear remaining references to Async.

Just a cleanup run.
[minor] Does the TODO here and below still make sense, or can we remove that too?