Removing async support