More aggressive duplicate trimming

since it's so hard to keep the source files unique