Improved treasure removal.