some elf cleanups