Remove async module (where possible)