[DF-185] Removed unused code