Change for an async version
Remove uneeded