Removing async and batch connection creation