Removed useless async methods and callback