Remove dependency on aysnc