Remove duplicate files.
Improve 6.5 compat.