Remove references to self._data