Remove dependency on async