Remove async completely