[DF-5025] Some code cleaning