[DF-1785] Code cleanup