[DF-4571] code cleaning.