Remove do notation, better handled by async/await