no need to do this work asynchronously, so simplify the code.