[DF-2551] Remove unneeded code