Remove duplicate async code

After reading a bit more about await and testing async functionality,
I've been  able to remove what's not needed and reduce the code
duplication. This should help us be more agile as we add/maintain the
code.