remove all references to 'thing'