[DF-2274] Removed unneccesary code.