EG: removed unnecessary lines