[DF-5161] Code cleanup