More consolidation of pre-version control duplicates