Added removal of treasures (attempt 2)