Remove disconnect() and move logic to Close()