Refactor - remove one main thread read only connection