DF-2245. Remove unneeded code