Removed all uses of [e | l] from the codebase