Extracted common async pattern into a single function.
Removed old TODO.