Remove RecordWrapper