Fix 37 remove some async