[DF-4267] Code cleanup