[DF-4580] Removed deprecated code