removing async specific handling