smartened up metadata scrubbing