Moved scrub code from POST to 'apply' so options are only stored if truly applied to files