[DF-2577] Remove unneeded code