RFI scrubbing enhancement