Fix Close method of Dataspace

The finalizer interfered with the Close method.
I made the change across the board.