Merge pull request #2239 from alex/finish-remove-duplication

Completed the removal of duplicate oids