Remove if elf statements