ENYO-3202
- delete duplicated code