Remove use of async for simplicty