Removing async support, moving all connetions to generate