Update disconnect logic

Update disconnect logic so we close streams instead of underlying
sockets.