Fixes

• Improvements to the submission scrubber to improve safety and avoid conflicts with other plugins (props: @georgestephanis, @cliffordp)