Cleanup

Cleanup on elf stuff.