[DF-2509] Remove unneeded code