[DF-740] - excessive code removed.