put back old code
+ remove duplicate EL API
3 files changed