cleanup "OS stripping" leftover in context.save