ENYO-2494: Code cleaning