[DF-3888] Remove unneeded code