Removing async stuff, take that tim