Removed old refs to elib-popup
Resovled merge conflict