Remove duplicates and add some missing opcodes