Cleanup
Handle unconnected connection resource consistently