[DF-4755] Remove unneeded code