+ [OE-3896] more clean up on anaesthetic to deal with witness field