Undo change to __delitem__.

It does not really help.
Test the 'clear' method.
Test newer way of cleaning up old items.