Refactor some concurrency modules and make some small improvements

[harendra-kumar]

The only significant change is removal of the two queues for async case - a08d4959c2ba2b0d85b44b4acff70823021b1c62 . This was introduced recently but found to be not useful.