[DF-4334] Remove unused code