elf cleanups