ENYO-2978: really remove dead code
ENYO-2978: code improvement