Remove unnecessary connection factory instantiation