Merge "Remove duplicate files, no point in loading them twice"