Removed the day we fight back extra async calls