Cleanup connection access in last merge