ENYO-2495: Dead code removing