More cleaning of the elfloader