Remove some async stuff