[DF-4113] cleaning code.